aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-06-10 21:37:09 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-10 21:37:09 +0200
commitd5f911e68fb79aaf7123a744e49a02bdfb6c852e (patch)
treef7725a05192d198152c20948873cbcf11ae84bcf
parent677e3c18fe4ce65afd0f0dc3bdacedf3854fb2e6 (diff)
downloadupstream-d5f911e68fb79aaf7123a744e49a02bdfb6c852e.tar.gz
upstream-d5f911e68fb79aaf7123a744e49a02bdfb6c852e.tar.bz2
upstream-d5f911e68fb79aaf7123a744e49a02bdfb6c852e.zip
OpenWrt v22.03.0-rc4: revert to branch defaults
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, 9 insertions, 11 deletions
diff --git a/feeds.conf.default b/feeds.conf.default
index 5e63a69ab3..f20f9db1e4 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-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
+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
diff --git a/include/version.mk b/include/version.mk
index 8a8ba2bc51..ca6a15bdbf 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.0-rc4)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT)
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19426-2b1941e47d)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.0-rc4)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03-SNAPSHOT)
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 5aba3d8894..f7f1d7b30a 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.0-rc4"
+ default "https://downloads.openwrt.org/releases/22.03-SNAPSHOT"
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 n
+ default y
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
deleted file mode 100644
index 2fc3ba8c38..0000000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r19426-2b1941e47d
diff --git a/version.date b/version.date
deleted file mode 100644
index e8c5e2bc41..0000000000
--- a/version.date
+++ /dev/null
@@ -1 +0,0 @@
-1654845621