summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens2024-07-22 22:56:37 +0000
committerHauke Mehrtens2024-07-22 22:56:37 +0000
commitb5dc35c8bb260e56ab7280264fb9270544a7d69f (patch)
treed6e344d439add8a92c93a58a98b9f41da480655f
parent591b7e93d316ca1d6812cac179dae9200aeca07b (diff)
downloadopenwrt-b5dc35c8bb260e56ab7280264fb9270544a7d69f.tar.gz
OpenWrt v22.03.7: adjust config defaultsv22.03.7
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 f20f9db1e4..4635578523 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^3b79b05673a15e7f41f157d1320597244a344a95
+src-git-full luci https://git.openwrt.org/project/luci.git^374888b1476df064281022c4d605b7ecf9e684e4
+src-git-full routing https://git.openwrt.org/feed/routing.git^1ff9ee61cde0829f206f275b1b2f5fa990fd2ba9
+src-git-full telephony https://git.openwrt.org/feed/telephony.git^2a69b3a6f0a42c7fa965a72f9a1361cb94a1ce86
diff --git a/include/version.mk b/include/version.mk
index ca6a15bdbf..b4b471826c 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.7)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r20341-591b7e93d3)
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.7)
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..c236e868db 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.7"
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..1aece5433e
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r20341-591b7e93d3
diff --git a/version.date b/version.date
new file mode 100644
index 0000000000..d0ee25c124
--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
+1721082354