Author: jow Date: 2015-01-23 14:09:54 +0100 (Fri, 23 Jan 2015) New Revision: 44091
Modified: trunk/include/version.mk trunk/package/base-files/image-config.in Log: include, base-files: align default repository url with changed buildbot structure Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/include/version.mk =================================================================== --- trunk/include/version.mk 2015-01-23 13:09:50 UTC (rev 44090) +++ trunk/include/version.mk 2015-01-23 13:09:54 UTC (rev 44091) @@ -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:=$(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) Modified: trunk/package/base-files/image-config.in =================================================================== --- trunk/package/base-files/image-config.in 2015-01-23 13:09:50 UTC (rev 44090) +++ trunk/package/base-files/image-config.in 2015-01-23 13:09:54 UTC (rev 44091) @@ -170,7 +170,7 @@ 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 @@ %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" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
