From: jow Date: Sat, 10 Jan 2015 11:17:11 +0000 (+0000) Subject: version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710) X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=6bae8599bf55527b3373f26e4fa7dccdc1267e0c;p=openwrt.git version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710) Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43905 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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' \