Author: blogic Date: 2016-03-20 15:45:02 +0100 (Sun, 20 Mar 2016) New Revision: 49053
Modified: branches/chaos_calmer/include/version.mk branches/chaos_calmer/package/base-files/image-config.in Log: CC: version.mk and image-config.in: adjust to 15.05.1 * Adjust the default version number in include/version.mk to 15.05.1 * Copy the correct download repo location from include/version.mk to base-files/image-config.in After the change to version.mk, new builds made from CC sources will have opkg config that downloads from the recent 15.05.1 packages repo instead of the ancient 15.05 packages repo. The change to image-config.in ensures that if somebody uses VERSIONOPT config options in .config, he will get the correct download repo address (instead of trunk snapshots). Signed-off-by: Hannu Nyman <[email protected]> Modified: branches/chaos_calmer/include/version.mk =================================================================== --- branches/chaos_calmer/include/version.mk 2016-03-20 14:44:59 UTC (rev 49052) +++ branches/chaos_calmer/include/version.mk 2016-03-20 14:45:02 UTC (rev 49053) @@ -21,7 +21,7 @@ #' VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),15.05) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),15.05.1) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Chaos Calmer) Modified: branches/chaos_calmer/package/base-files/image-config.in =================================================================== --- branches/chaos_calmer/package/base-files/image-config.in 2016-03-20 14:44:59 UTC (rev 49052) +++ branches/chaos_calmer/package/base-files/image-config.in 2016-03-20 14:45:02 UTC (rev 49053) @@ -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/%n/%v/%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: _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
