From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 17 Nov 2020 22:16:57 +0000 (+0100)
Subject: OpenWrt v18.06.9: adjust config defaults
X-Git-Tag: v18.06.9^0
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8df5312a77816e21c1e953d168377fa69eecdf52;p=openwrt%2Fstaging%2Fchunkeey.git

OpenWrt v18.06.9: adjust config defaults

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/feeds.conf.default b/feeds.conf.default
index 763a26902e..3f2e755bf5 100644
--- 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^65e91999666573eac2d9d57ed4ecadac029cf8f3
+src-git luci https://git.openwrt.org/project/luci.git^ab22243b4928bd81936f56422970c10192cdad8e
+src-git routing https://git.openwrt.org/feed/routing.git^83f515d7ae76e5a7460c0eacadae806363df05a1
+src-git telephony https://git.openwrt.org/feed/telephony.git^8ecbdabc7c5cadbe571eb947f5cd333a5a785010
diff --git a/include/version.mk b/include/version.mk
index 1c4b01c7e7..132db43613 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -26,13 +26,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.9)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r8077-7cbbab7246)
 
 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.9)
 
 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 6c9d631d04..7a04f58ee2 100644
--- 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.9"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
@@ -259,7 +259,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
index 0000000000..276ff8cda2
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r8077-7cbbab7246
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..a4c761fcf7
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1605125398