X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/39a3cef8d7b310d70cca42e393ab565951cef8b3..35fbeba8126fa33b9d066a5219c8f0c3cffbc285:/include/package-ipkg.mk diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 452ae5032..de9798413 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -22,8 +22,13 @@ define BuildIPKGVariable $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); endef +dep_split=$(subst :,$(space),$(1)) +dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1))) +dep_val=$(word 2,$(call dep_split,$(1))) +filter_deps=$(foreach dep,$(1),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep))) + ifeq ($(DUMP),) - define BuildIPKG + define BuildTarget/ipkg IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list @@ -42,7 +47,7 @@ ifeq ($(DUMP),) endif endif - IDEPEND_$(1):=$$(strip $$(DEPENDS)) + IDEPEND_$(1):=$$(call filter_deps,$$(strip $$(DEPENDS))) $(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),preinst)) @@ -60,6 +65,7 @@ ifeq ($(DUMP),) DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ done; \ echo "Depends: $$$$DEPENDS"; \ + echo "Provides: $(PROVIDES)"; \ echo "Source: $(SOURCE)"; \ echo "Section: $(SECTION)"; \ echo "Priority: $(PRIORITY)"; \ @@ -91,9 +97,6 @@ ifeq ($(DUMP),) $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED) -@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null @touch $$@ - - $$(eval $$(call Build/DefaultTargets,$(1))) - endef $(STAGING_DIR)/etc/ipkg.conf: