From c523c81bfedc3bf77e8981b11e8bef7f00fa3f5f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 23 Jan 2015 13:09:50 +0000 Subject: [PATCH] Revert "version.mk: add "%s" placeholder for dotted target.subtarget notation" This reverts commit d388882dccc1b25575939c3713b3ab394c371fd0. SVN-Revision: 44090 --- include/version.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/version.mk b/include/version.mk index d4addd608f..c4747f236f 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/%s/packages) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages) VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) @@ -79,7 +79,6 @@ 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