aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-01-10 11:17:11 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-01-10 11:17:11 +0000
commit54602a82a4a632d5546f948d8b7372953dde7477 (patch)
tree62fc7d31e2b2e9cee5c05cc176d06c8030f6c7ab
parent4685e4f27310d55c20c8062b2b4f782e4b709694 (diff)
downloadupstream-54602a82a4a632d5546f948d8b7372953dde7477.tar.gz
upstream-54602a82a4a632d5546f948d8b7372953dde7477.tar.bz2
upstream-54602a82a4a632d5546f948d8b7372953dde7477.zip
version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 43905
-rw-r--r--include/version.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/version.mk b/include/version.mk
index d4addd608f..5d191cc8aa 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -79,7 +79,7 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
-e 's,%R,$(REVISION),g' \
-e 's,%T,$(BOARD),g' \
-e 's,%S,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic),g' \
- -e 's,%s,$(BOARD)$(if $(SUBTARGET),.$(SUBTARGET)),g' \
+ -e 's,%s,$(BOARD)$(if $(filter-out generic,$(SUBTARGET)),.$(SUBTARGET)),g' \
-e 's,%t,$(VERSION_TAINTS),g' \
-e 's,%M,$(VERSION_MANUFACTURER),g' \
-e 's,%P,$(VERSION_PRODUCT),g' \