From: Hauke Mehrtens Date: Sun, 31 Jul 2022 22:05:33 +0000 (+0200) Subject: OpenWrt v22.03.0-rc6: revert to branch defaults X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=596efe1356dae2c8c6ed912b23ee17d76b44a1f7;p=openwrt%2Fstaging%2Fstintel.git OpenWrt v22.03.0-rc6: revert to branch defaults Signed-off-by: Hauke Mehrtens --- diff --git a/feeds.conf.default b/feeds.conf.default index 17e0a42640..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^72abf7e9f4cd6bbb9098ded9e9a0fe28e515d47f -src-git-full luci https://git.openwrt.org/project/luci.git^69231a7d62a3b809fc5972071e691fb02730a10e -src-git-full routing https://git.openwrt.org/feed/routing.git^1ccc4e435175e6ba5ac60e626e1e95eb25c5757b -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 f5f743ad2c..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-rc6) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19590-042d558536) +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-rc6) +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 484d7ed69e..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-rc6" + 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 6fb0034735..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r19590-042d558536 diff --git a/version.date b/version.date deleted file mode 100644 index 6a9d8caf0c..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1659280367