From 54602a82a4a632d5546f948d8b7372953dde7477 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 10 Jan 2015 11:17:11 +0000 Subject: [PATCH] version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710) Signed-off-by: Jo-Philipp Wich SVN-Revision: 43905 --- include/version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' \