OpenWrt v22.03.4: revert to branch defaults
authorDaniel Golle <daniel@makrotopia.org>
Sun, 9 Apr 2023 22:35:24 +0000 (23:35 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Sun, 9 Apr 2023 22:35:24 +0000 (23:35 +0100)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
feeds.conf.default
include/version.mk
package/base-files/image-config.in
version [deleted file]
version.date [deleted file]

index 39fda39ba55cf39d4c6d87101b1f7b28a406cb57..f20f9db1e470a2df4cf25ca7a584801a8608ac8e 100644 (file)
@@ -1,4 +1,4 @@
-src-git-full packages https://git.openwrt.org/feed/packages.git^38cb0129739bc71e0bb5a25ef1f6db70b7add04b
-src-git-full luci https://git.openwrt.org/project/luci.git^ce20b4a6e0c86313c0c6e9c89eedf8f033f5e637
-src-git-full routing https://git.openwrt.org/feed/routing.git^1cc7676b9f32acc30ec47f15fcb70380d5d6ef01
-src-git-full telephony https://git.openwrt.org/feed/telephony.git^5087c7ecbc4f4e3227bd16c6f4d1efb0d3edf460
+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 ce8a2d20e8390298124cce08354492485bedd6fb..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.4)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r20123-38ccc47687)
+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.4)
+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)
index 297d39c1897dff659b92bd4addce19ade1faa934..f7f1d7b30aaa7d235093824df9da6261b2425e9b 100644 (file)
@@ -183,7 +183,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "https://downloads.openwrt.org/releases/22.03.4"
+               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 (file)
index 10182b9..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r20123-38ccc47687
diff --git a/version.date b/version.date
deleted file mode 100644 (file)
index fb4879c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1681043266