From aa29fdce3d35a326245ec435e8b84314461ab71e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 18 Jul 2006 15:31:01 +0000 Subject: [PATCH] check if the Package/$(NAME) template is defined before packaging or installing ipkg packages SVN-Revision: 4144 --- openwrt/include/package.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/openwrt/include/package.mk b/openwrt/include/package.mk index 7aea314abc..2784cc8881 100644 --- a/openwrt/include/package.mk +++ b/openwrt/include/package.mk @@ -65,6 +65,7 @@ define Package/Default SECTION:=opt CATEGORY:=Extra packages DEPENDS:= + EXTRA_DEPENDS:= MAINTAINER:=OpenWrt Developers Team SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) ifneq ($(PKG_VERSION),) @@ -113,12 +114,14 @@ define BuildPackage IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list - ifeq ($(CONFIG_PACKAGE_$(1)),y) - install-targets: $$(INFO_$(1)) - endif + ifdef Package/$(1)/install + ifeq ($(CONFIG_PACKAGE_$(1)),y) + install-targets: $$(INFO_$(1)) + endif - ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) - compile-targets: $$(IPKG_$(1)) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + compile-targets: $$(IPKG_$(1)) + endif endif ifeq ($(FORCEREBUILD),y) @@ -182,7 +185,7 @@ define BuildPackage for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ done; \ - echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ + echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ ) echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control