From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 23 Jan 2015 13:09:45 +0000 (+0000)
Subject: Revert "version.mk: explicitely filter "generic" subtarget for "%s" placeholder ... 
X-Git-Tag: reboot~4590
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e568a17e9b6baa638b56ee7ba485b073977ce3e4;p=openwrt%2Fstaging%2Flynxis.git

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

This reverts commit d907396dc1c2ae0268dc54835b108afef4761d4e.

SVN-Revision: 44089
---

diff --git a/include/version.mk b/include/version.mk
index 5d191cc8aa..d4addd608f 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 $(filter-out generic,$(SUBTARGET)),.$(SUBTARGET)),g' \
+	-e 's,%s,$(BOARD)$(if $(SUBTARGET),.$(SUBTARGET)),g' \
 	-e 's,%t,$(VERSION_TAINTS),g' \
 	-e 's,%M,$(VERSION_MANUFACTURER),g' \
 	-e 's,%P,$(VERSION_PRODUCT),g' \