OpenWrt v18.06.1: adjust config defaults

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/feeds.conf.default b/feeds.conf.default
index 763a26902e5fedbcbbc68a866b384fcf176a1f1e..9dddc195324f6c02e17df3fec3eda05e06756430 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-18.06
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-18.06
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-18.06
+src-git packages https://git.openwrt.org/feed/packages.git^35e0b737ab496f5b51e80079b0d8c9b442e223f5
+src-git luci https://git.openwrt.org/project/luci.git^f64b1523447547032d5280fb0bcdde570f2ca913
+src-git routing https://git.openwrt.org/feed/routing.git^1b9d1c419f0ecefda51922a7845ab2183d6acd76
+src-git telephony https://git.openwrt.org/feed/telephony.git^b9d7b321d15a44c5abb9e5d43a4ec78abfd9031b

diff --git a/include/version.mk b/include/version.mk
index 55228307428858f43ca084a512230041c663310d..ffa0fd52b044ca7756407eba1471d84805960d9c 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -25,13 +25,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06.1)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7258-5eb055306f)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06.1)
 
 VERSION_DIST:=$(call qstrip,$(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 cee8cd54e1239a3dd424fa86df8fac3eaa1d31b8..4ea8d55f75b45fd3d7b0d454e335c9f7bbd99b41 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -183,7 +183,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "http://downloads.openwrt.org/releases/18.06-SNAPSHOT"
+               default "http://downloads.openwrt.org/releases/18.06.1"
                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders:
@@ -253,7 +253,7 @@ if VERSIONOPT
        config VERSION_CODE_FILENAMES
                bool
                prompt "Revision code in filenames"
-               default y
+               default n
                help
                        Enable this to include the revision identifier or the configured
                        version code into the firmware image, SDK- and Image Builder archive

diff --git a/version b/version
new file mode 100644 (file)
index 0000000..42dde3f
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r7258-5eb055306f

diff --git a/version.date b/version.date
new file mode 100644 (file)
index 0000000..5cf9b5d
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1534405875