X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fversion.mk;h=575398bc2069b2383ba5364533fdbf7bb5d900de;hb=d8cac882ed1b2571c18da85f3cf3d151f5e4a332;hp=4687dcc2e0b495711c27aa6f5f563da0823b0f0f;hpb=360a996cc0962a0455f19a95108be155e53f885b;p=openwrt.git diff --git a/include/version.mk b/include/version.mk index 4687dcc2e0..575398bc20 100644 --- a/include/version.mk +++ b/include/version.mk @@ -29,6 +29,30 @@ VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/ VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) + +define taint2sym +$(CONFIG_$(firstword $(subst :, ,$(subst +,,$(subst -,,$(1)))))) +endef + +define taint2name +$(lastword $(subst :, ,$(1))) +endef + +VERSION_TAINT_SPECS := \ + -ALL:no-all \ + -IPV6:no-ipv6 \ + +USE_EGLIBC:eglibc \ + +USE_MKLIBS:mklibs \ + +BUSYBOX_CUSTOM:busybox \ + +VERSION_TAINTS := $(strip $(foreach taint,$(VERSION_TAINT_SPECS), \ + $(if $(findstring +,$(taint)), \ + $(if $(call taint2sym,$(taint)),$(call taint2name,$(taint))), \ + $(if $(call taint2sym,$(taint)),,$(call taint2name,$(taint))) \ + ))) + +PKG_CONFIG_DEPENDS += $(foreach taint,$(VERSION_TAINT_SPECS),$(call taint2sym,$(taint))) + VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%V,$(VERSION_NUMBER),g' \ -e 's,%v,\L$(subst $(space),_,$(VERSION_NUMBER)),g' \ @@ -40,4 +64,5 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%d,\L$(subst $(space),_,$(VERSION_DIST)),g' \ -e 's,%R,$(REVISION),g' \ -e 's,%T,$(BOARD),g' \ - -e 's,%S,$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET)),g' \ + -e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \ + -e 's,%t,$(VERSION_TAINTS),g' \