From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 10 Jan 2015 11:17:11 +0000 (+0000)
Subject: version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)
X-Git-Tag: reboot~4763
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=54602a82a4a632d5546f948d8b7372953dde7477;p=openwrt%2Fstaging%2Fjogo.git

version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43905
---

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' \