Author: jow Date: 2015-01-08 13:46:37 +0100 (Thu, 08 Jan 2015) New Revision: 43871
Modified: trunk/include/version.mk Log: version.mk: add "%s" placeholder for dotted target.subtarget notation Implement "%s" placeholder that expands to either the target name, e.g. "ar71xx" if the subtarget is generic or to target.subtarget, e.g. "ar71xx.nand" is a subtarget is choosen. Also change the default repository url template to use "%s" instead of "%T" to reflect the directory structure used by the buildbot systems. Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/include/version.mk =================================================================== --- trunk/include/version.mk 2015-01-08 11:31:36 UTC (rev 43870) +++ trunk/include/version.mk 2015-01-08 12:46:37 UTC (rev 43871) @@ -30,7 +30,7 @@ VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%s/packages) VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) @@ -79,6 +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 $(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
