OpenWrt v19.07.0-rc1: adjust config defaults

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

diff --git a/feeds.conf.default b/feeds.conf.default
index 42c2b0ba3b935b23290efadafe93e1c674a6769a..c59ab3e516a74c5831c04a6405966c764bc79048 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-19.07
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-19.07
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-19.07
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-19.07
+src-git packages https://git.openwrt.org/feed/packages.git^3f3c613ac5bbbd74eac636c3cb1c5cdcf0cbfbe8
+src-git luci https://git.openwrt.org/project/luci.git^c0e73d3f9567f227cbe36ba12af53efbfdd4343d
+src-git routing https://git.openwrt.org/feed/routing.git^8d5ee29f088e9dfaa49dc74573edb1919f14dbf4
+src-git telephony https://git.openwrt.org/feed/telephony.git^821bcb7c58a24ea65f022ad2221ba68143533157

diff --git a/include/version.mk b/include/version.mk
index db0167d811627d9917b683f4453fabbe42619816..c4f08df578faf5f277a0070c5e4baeccfebdb142 100644 (file)
--- 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),19.07-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07.0-rc1)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r10649-c4fdb377a2)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/19.07.0-rc1)
 
 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 560b66dfc91b81f8a9d553c8b07eeb599fb9b6b2..e40490c422bfe515b090e137c3dc0faa8219d772 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/19.07-SNAPSHOT"
+               default "http://downloads.openwrt.org/releases/19.07.0-rc1"
                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 (file)
index 0000000..a1340c3
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r10649-c4fdb377a2

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