diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-23 13:09:45 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-23 13:09:45 +0000 |
| commit | e568a17e9b6baa638b56ee7ba485b073977ce3e4 (patch) | |
| tree | 8aa654fa49f56cc111b6d4eb1836b1ab4390a256 /include | |
| parent | 9694917416046b948fe6f814073133f13c641f39 (diff) | |
| download | upstream-e568a17e9b6baa638b56ee7ba485b073977ce3e4.tar.gz upstream-e568a17e9b6baa638b56ee7ba485b073977ce3e4.tar.bz2 upstream-e568a17e9b6baa638b56ee7ba485b073977ce3e4.zip | |
Revert "version.mk: explicitely filter "generic" subtarget for "%s" placeholder (#18710)"
This reverts commit d907396dc1c2ae0268dc54835b108afef4761d4e.
SVN-Revision: 44089
Diffstat (limited to 'include')
| -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 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' \ |