diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-23 13:09:54 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-23 13:09:54 +0000 |
| commit | 78daa9139c623be63c95ea7dc066dfea2fda5309 (patch) | |
| tree | e5c0b7d115170d22faa93aaf3433971c5a416a27 | |
| parent | 8b112e53060f8dcc77c45995cc0624dcc82c7688 (diff) | |
| download | master-187ad058-78daa9139c623be63c95ea7dc066dfea2fda5309.tar.gz master-187ad058-78daa9139c623be63c95ea7dc066dfea2fda5309.tar.bz2 master-187ad058-78daa9139c623be63c95ea7dc066dfea2fda5309.zip | |
include, base-files: align default repository url with changed buildbot structure
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44091 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/version.mk | 4 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 3 |
2 files changed, 3 insertions, 4 deletions
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" |