aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-01-23 13:09:45 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-01-23 13:09:45 +0000
commitdacc8f2889d24159debabb8dc49bccd7586a4aa0 (patch)
treecfaaed3ef5cfddec1fb77640ac68a933a15360d2 /include
parentd2b3101053271ee96e7bfc9705698b0ca8bb2a4a (diff)
downloadupstream-dacc8f2889d24159debabb8dc49bccd7586a4aa0.tar.gz
upstream-dacc8f2889d24159debabb8dc49bccd7586a4aa0.tar.bz2
upstream-dacc8f2889d24159debabb8dc49bccd7586a4aa0.zip
Revert "version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)"
This reverts commit d907396dc1c2ae0268dc54835b108afef4761d4e. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44089 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/version.mk2
1 files changed, 1 insertions, 1 deletions
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' \