[openwrt/openwrt] OpenWrt v22.03.0-rc4: adjust config defaults
LEDE Commits
lede-commits at lists.infradead.org
Fri Jun 10 12:43:33 PDT 2022
hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/677e3c18fe4ce65afd0f0dc3bdacedf3854fb2e6
commit 677e3c18fe4ce65afd0f0dc3bdacedf3854fb2e6
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Fri Jun 10 21:36:53 2022 +0200
OpenWrt v22.03.0-rc4: adjust config defaults
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
feeds.conf.default | 8 ++++----
include/version.mk | 6 +++---
package/base-files/image-config.in | 4 ++--
version | 1 +
version.date | 1 +
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/feeds.conf.default b/feeds.conf.default
index f20f9db1e4..5e63a69ab3 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-22.03
-src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-22.03
-src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-22.03
-src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-22.03
+src-git-full packages https://git.openwrt.org/feed/packages.git^afea2bcafca132022ac4470e2d495962720348fb
+src-git-full luci https://git.openwrt.org/project/luci.git^28e92e3f8c3bd06ecbade1873f2c255c354672c2
+src-git-full routing https://git.openwrt.org/feed/routing.git^4b2b6b3d2b0178d254943409cfb4bdce0edbbda4
+src-git-full telephony https://git.openwrt.org/feed/telephony.git^1d2031a5c82816483c51bca15649e2957fbe2bc2
diff --git a/include/version.mk b/include/version.mk
index ca6a15bdbf..8a8ba2bc51 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -23,13 +23,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),22.03-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03.0-rc4)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19426-2b1941e47d)
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.0-rc4)
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 f7f1d7b30a..5aba3d8894 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 "https://downloads.openwrt.org/releases/22.03-SNAPSHOT"
+ default "https://downloads.openwrt.org/releases/22.03.0-rc4"
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..2fc3ba8c38
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r19426-2b1941e47d
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..e8c5e2bc41
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1654845621
More information about the lede-commits
mailing list