aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-01-06 21:50:22 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-01-06 21:50:22 +0100
commit8004e3f2c6c27e3ce0ae440198a3f2c3735da492 (patch)
treee228161b329cdda05bb5e5bd20bd35d1b56ba849
parentd81a8a3e29c466c796e7d2eb4b320ad939fb4273 (diff)
downloadupstream-8004e3f2c6c27e3ce0ae440198a3f2c3735da492.tar.gz
upstream-8004e3f2c6c27e3ce0ae440198a3f2c3735da492.tar.bz2
upstream-8004e3f2c6c27e3ce0ae440198a3f2c3735da492.zip
OpenWrt v18.06.6: adjust config defaultsv18.06.6
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--feeds.conf.default8
-rw-r--r--include/version.mk6
-rw-r--r--package/base-files/image-config.in4
-rw-r--r--version1
-rw-r--r--version.date1
5 files changed, 11 insertions, 9 deletions
diff --git a/feeds.conf.default b/feeds.conf.default
index 763a26902e..943abcc9df 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^b0df5d33652220a384593d7b52a8453b022b8f9b
+src-git luci https://git.openwrt.org/project/luci.git^868abc1a564ca8366bbb018a967923cbdc5ee27a
+src-git routing https://git.openwrt.org/feed/routing.git^9fa2b249cc286176f07efe343fd9518b383462fc
+src-git telephony https://git.openwrt.org/feed/telephony.git^8ecbdabc7c5cadbe571eb947f5cd333a5a785010
diff --git a/include/version.mk b/include/version.mk
index 1c4b01c7e7..e468360248 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.6)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7957-d81a8a3e29)
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.6)
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..9627f6bd90 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.6"
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..6ca857aae4
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r7957-d81a8a3e29
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..6545608b4d
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1578251167