diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-10 11:17:11 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-10 11:17:11 +0000 |
| commit | c6d03d1503346df167c37fb0348c2246531805b3 (patch) | |
| tree | eac9b0c24ceae8cb2d5cb4ba31583cd87a7e92b6 /include/version.mk | |
| parent | f1dfc77d7b7bfa2883e5542953cf97babc9de684 (diff) | |
| download | master-187ad058-c6d03d1503346df167c37fb0348c2246531805b3.tar.gz master-187ad058-c6d03d1503346df167c37fb0348c2246531805b3.tar.bz2 master-187ad058-c6d03d1503346df167c37fb0348c2246531805b3.zip | |
version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/version.mk')
| -rw-r--r-- | include/version.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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' \ |