hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some dependencies that are depending on target are not added into the Depends line in the control file of the package. For example +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb does not result in kmod-ssb for the x86 target or any other target. 

This fixes #6874

SVN-Revision: 20553
owl
Hauke Mehrtens 2010-03-28 19:22:59 +00:00
parent 5f89a1f096
commit 3dd6909c20
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/package-ipkg.mk
View File

@ -24,11 +24,18 @@ define BuildIPKGVariable
$(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
endef endef
PARENL :=(
PARENR :=)
dep_split=$(subst :,$(space),$(1)) dep_split=$(subst :,$(space),$(1))
dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1))) dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
dep_val=$(word 2,$(call dep_split,$(1))) dep_val=$(word 2,$(call dep_split,$(1)))
strip_deps=$(strip $(subst +,,$(filter-out @%,$(1)))) strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep))) filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
ifeq ($(DUMP),) ifeq ($(DUMP),)
define BuildTarget/ipkg define BuildTarget/ipkg