From 0dd82ce32b59116e1fe26ab6273d436269b7ee3e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 8 Jan 2015 12:46:37 +0000 Subject: [PATCH] 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 SVN-Revision: 43871 --- include/version.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/version.mk b/include/version.mk index c4747f236f..d4addd608f 100644 --- a/include/version.mk +++ b/include/version.mk @@ -30,7 +30,7 @@ VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) 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 @@ 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,%t,$(VERSION_TAINTS),g' \ -e 's,%M,$(VERSION_MANUFACTURER),g' \ -e 's,%P,$(VERSION_PRODUCT),g' \ -- 2.30.2