OpenWrt v22.03.0-rc2: revert to branch defaults
authorPaul Spooren <mail@aparcar.org>
Sat, 21 May 2022 16:36:24 +0000 (18:36 +0200)
committerPaul Spooren <mail@aparcar.org>
Sat, 21 May 2022 16:36:24 +0000 (18:36 +0200)
Signed-off-by: Paul Spooren <mail@aparcar.org>
feeds.conf.default
include/version.mk
version [deleted file]
version.date [deleted file]

index 841a6da90a00e6938edee963c88d125934c95c6c..f20f9db1e470a2df4cf25ca7a584801a8608ac8e 100644 (file)
@@ -1,4 +1,4 @@
-src-git-full packages https://git.openwrt.org/feed/packages.git^b708cf5a17a1498b02c3ca4fd66f99aba3773c9c
-src-git-full luci https://git.openwrt.org/project/luci.git^d8ecf48f20da632af86def0f18093861c522914b
-src-git-full routing https://git.openwrt.org/feed/routing.git^f6d2b09643dfdc3b3916cb116ebc3f45a058fae6
-src-git-full telephony https://git.openwrt.org/feed/telephony.git^4c148548df2aae3c036a5e309ff0474dbb1f48ac
+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
index 34fd7bb6f65b1c8ea29e36d00fe91eae881e30bc..ca6a15bdbff27d94941a1cdd92a894332f0384bd 100644 (file)
@@ -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-rc2)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19374-34b6abf5a8)
+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-rc2)
+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/version b/version
deleted file mode 100644 (file)
index 45bcab7..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r19374-34b6abf5a8
diff --git a/version.date b/version.date
deleted file mode 100644 (file)
index 439ca52..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1653140740