Author: jow
Date: 2015-01-23 14:09:45 +0100 (Fri, 23 Jan 2015)
New Revision: 44089
Modified:
trunk/include/version.mk
Log:
Revert "version.mk: explicitely filter "generic" subtarget for "%s" placeholder
(#18710)"
This reverts commit d907396dc1c2ae0268dc54835b108afef4761d4e.
Modified: trunk/include/version.mk
===================================================================
--- trunk/include/version.mk 2015-01-23 12:41:06 UTC (rev 44088)
+++ trunk/include/version.mk 2015-01-23 13:09:45 UTC (rev 44089)
@@ -79,7 +79,7 @@
-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' \
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
