Revert "version.mk: explicitely filter "generic" subtarget for "%s" placeholder ...
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 23 Jan 2015 13:09:45 +0000 (13:09 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 23 Jan 2015 13:09:45 +0000 (13:09 +0000)
This reverts commit d907396dc1c2ae0268dc54835b108afef4761d4e.

SVN-Revision: 44089

include/version.mk

index 5d191cc..d4addd6 100644 (file)
@@ -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' \