From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 23 Jan 2015 13:09:54 +0000 (+0000)
Subject: include, base-files: align default repository url with changed buildbot structure
X-Git-Tag: reboot~4588
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ec8d515b21ece4d56186a2e99d9932fe2971142;p=openwrt%2Fstaging%2Fjogo.git

include, base-files: align default repository url with changed buildbot structure

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44091
---

diff --git a/include/version.mk b/include/version.mk
index c4747f236f..c3cc170045 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -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)
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 193ea08930..fd0ead6236 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -170,7 +170,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "http://downloads.openwrt.org/snapshots/trunk/%s/packages"
+		default "http://downloads.openwrt.org/snapshots/trunk/%S/packages"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
@@ -185,7 +185,6 @@ if VERSIONOPT
 			 %d .. Distribution name or "openwrt", lowercase
 			 %T .. Target name
 			 %S .. Target/Subtarget name
-			 %s .. Target/Subtarget name in dotted notation, e.g. "ar71xx" or "ar71xx.nand"
 			 %t .. Build taint flags, e.g. "no-all busybox"
 			 %M .. Manufacturer name or "OpenWrt"
 			 %P .. Product name or "Generic"