X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fversion.mk;h=4bce0965ca2389753bb83b242c0d942f96b2d5f5;hb=73a8589c54ff2a133301edacf6545cb0af5cb422;hp=c3cc170045d1723059f9239b8e9eace7e08a2425;hpb=04ef21d09b10c9e5fec0d9f5be9e5dc9d29bfbdf;p=openwrt.git diff --git a/include/version.mk b/include/version.mk index c3cc170045..4bce0965ca 100644 --- a/include/version.mk +++ b/include/version.mk @@ -14,6 +14,7 @@ PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_REPO \ CONFIG_VERSION_DIST \ CONFIG_VERSION_MANUFACTURER \ + CONFIG_VERSION_MANUFACTURER_URL \ CONFIG_VERSION_PRODUCT \ CONFIG_VERSION_HWREV \ @@ -38,6 +39,9 @@ VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER)) VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt) +VERSION_MANUFACTURER_URL:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER_URL)) +VERSION_MANUFACTURER_URL:=$(if $(VERSION_MANUFACTURER_URL),$(VERSION_MANUFACTURER_URL),http://www.openwrt.org/) + VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT)) VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic) @@ -53,11 +57,12 @@ $(lastword $(subst :, ,$(1))) endef VERSION_TAINT_SPECS := \ - -ALL:no-all \ + -ALL_KMODS:no-all \ -IPV6:no-ipv6 \ - +USE_EGLIBC:eglibc \ + +USE_GLIBC:glibc \ +USE_MKLIBS:mklibs \ +BUSYBOX_CUSTOM:busybox \ + +OVERRIDE_PKGS:override \ VERSION_TAINTS := $(strip $(foreach taint,$(VERSION_TAINT_SPECS), \ $(if $(findstring +,$(taint)), \ @@ -81,6 +86,7 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \ -e 's,%t,$(VERSION_TAINTS),g' \ -e 's,%M,$(VERSION_MANUFACTURER),g' \ + -e 's,%m,$(VERSION_MANUFACTURER_URL),g' \ -e 's,%P,$(VERSION_PRODUCT),g' \ -e 's,%h,$(VERSION_HWREV),g'