diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-29 13:30:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-29 13:30:23 +0000 |
| commit | d5653558ac0044824974c7e73d349e4b2747e3ab (patch) | |
| tree | d21e3225d3c667afe726dd2c24592acd58ece1a0 /include/version.mk | |
| parent | dbb77e39a07a86b18ecc4ce27bb2841e0a099c9d (diff) | |
| download | upstream-d5653558ac0044824974c7e73d349e4b2747e3ab.tar.gz upstream-d5653558ac0044824974c7e73d349e4b2747e3ab.tar.bz2 upstream-d5653558ac0044824974c7e73d349e4b2747e3ab.zip | |
base-files: properly escape strings for version info
Make sure they don't break the sed command, and also make device_info
and openwrt_release more robust for parsing by scripts
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41885
Diffstat (limited to 'include/version.mk')
| -rw-r--r-- | include/version.mk | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/version.mk b/include/version.mk index a84065d1dd..c4747f236f 100644 --- a/include/version.mk +++ b/include/version.mk @@ -17,28 +17,31 @@ PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_PRODUCT \ CONFIG_VERSION_HWREV \ -VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) +qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) +#' + +VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION)) -VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) +VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge) -VERSION_NICK:=$(call qstrip,$(CONFIG_VERSION_NICK)) +VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) -VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) +VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages) -VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST)) +VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) -VERSION_MANUFACTURER:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER)) +VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER)) VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt) -VERSION_PRODUCT:=$(call qstrip,$(CONFIG_VERSION_PRODUCT)) +VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT)) VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic) -VERSION_HWREV:=$(call qstrip,$(CONFIG_VERSION_HWREV)) +VERSION_HWREV:=$(call qstrip_escape,$(CONFIG_VERSION_HWREV)) VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0) define taint2sym @@ -80,3 +83,5 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%M,$(VERSION_MANUFACTURER),g' \ -e 's,%P,$(VERSION_PRODUCT),g' \ -e 's,%h,$(VERSION_HWREV),g' + +VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED)) |