[OpenWrt-Devel] [PATCH v2] CC: version.mk and image-config.in: adjust to 15.05.1

[Hannu Nyman]

* 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 <hannu.nyman at iki.fi>
---
v2: adds also the image-config.in modification

New CC builds still download opkg info and packages from the
old 15.05 release repos (of Sep 2015), although fresh 15.05.1 packages
are available. The user needs to manually set the version number or
the download repo address config item to get the correct defaults.
There has already been some questions in the forum from people
building their own firmwares. 

This change adjusts the defaults so that a new build's opkg will
download from the 15.05.1 repo like the users expect.

Image-config.mk has still has the trunk snapshot repo address
as the default, and if somebody uses VERSIONOPT to change e.g. the
one of the values without setting also the download directory,
the wrong default config item (trunk snapshots) would get applied.
This change copies the correct default from version.mk.
(Note: Other items default to "", so their values are picked from
defaults in include/version.mk if they are not explicitly set here)


 include/version.mk                 | 2 +-
 package/base-files/image-config.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/version.mk b/include/version.mk
index 9348a24..ddce935 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -21,7 +21,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
 #'
 
 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)
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 495300d..0dfd6f6 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/%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:
-- 
2.5.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel