mirror of https://github.com/hak5/openwrt-owl.git
implement conditional dependencies for generating the Depends: field of ipkgs
SVN-Revision: 12836owl
parent
bbf0f2fac5
commit
cdcc68d689
|
@ -22,6 +22,11 @@ define BuildIPKGVariable
|
||||||
$(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
|
$(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
|
||||||
endef
|
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),)
|
ifeq ($(DUMP),)
|
||||||
define BuildTarget/ipkg
|
define BuildTarget/ipkg
|
||||||
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
|
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
|
||||||
|
@ -42,7 +47,7 @@ ifeq ($(DUMP),)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
IDEPEND_$(1):=$$(strip $$(DEPENDS))
|
IDEPEND_$(1):=$$(call filter_deps,$$(strip $$(DEPENDS)))
|
||||||
|
|
||||||
$(eval $(call BuildIPKGVariable,$(1),conffiles))
|
$(eval $(call BuildIPKGVariable,$(1),conffiles))
|
||||||
$(eval $(call BuildIPKGVariable,$(1),preinst))
|
$(eval $(call BuildIPKGVariable,$(1),preinst))
|
||||||
|
|
Loading…
Reference in New Issue