aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-01-06 22:40:58 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-01-06 22:40:58 +0100
commitaca39acedf98aa7e40119692f6b94681096becd2 (patch)
treeee8518933422d1a30649471d5c017b08bb94a795
parenta3ffeb413bca3da273aac924f4aa0f326a66a620 (diff)
downloadupstream-aca39acedf98aa7e40119692f6b94681096becd2.tar.gz
upstream-aca39acedf98aa7e40119692f6b94681096becd2.tar.bz2
upstream-aca39acedf98aa7e40119692f6b94681096becd2.zip
OpenWrt v19.07.0: adjust config defaultsv19.07.0
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 42c2b0ba3b..eaf5570e6b 100644
--- 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^d974cd36735353204fac679cb9febd6c9814c326
+src-git luci https://git.openwrt.org/project/luci.git^35aa5270592f7e837c42aa097f8fbb06faa4017d
+src-git routing https://git.openwrt.org/feed/routing.git^c82ce8d095a87df32bbd3a89e3cf113721d3ae82
+src-git telephony https://git.openwrt.org/feed/telephony.git^6f95d6ab3f359ee2ce81c20522700937424d1591
diff --git a/include/version.mk b/include/version.mk
index db0167d811..1d0fd996d6 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),19.07-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),19.07.0)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r10860-a3ffeb413b)
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)
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 560b66dfc9..7eb396fc6f 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/19.07-SNAPSHOT"
+ default "http://downloads.openwrt.org/releases/19.07.0"
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..dc0309aaaa
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r10860-a3ffeb413b
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..b468e9cffa
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1578329229