From 2376bed8329a33c4a586397f427779229eb0e899 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 7 Jun 2023 12:15:25 +0800 Subject: [PATCH] ImmortalWrt v23.05.0-rc1: revert to branch defaults Signed-off-by: Tianling Shen --- feeds.conf.default | 8 ++++---- include/version.mk | 6 +++--- package/base-files/image-config.in | 4 ++-- version | 1 - version.date | 1 - 5 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 version delete mode 100644 version.date diff --git a/feeds.conf.default b/feeds.conf.default index 3e7ba33776..995e4d1cdb 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/immortalwrt/packages.git^aa9062a9d0cf5b954536de8deaeda5d8687e5c50 -src-git luci https://github.com/immortalwrt/luci.git^97b46431415576463b27af583f7ff7c309452779 -src-git routing https://github.com/openwrt/routing.git^593a514ab53c4590bd0efc37ab82ae90460434bb -src-git telephony https://github.com/openwrt/telephony.git^129c8e0a9d68a39ad2dd550cf79dc8fc678f4a38 +src-git packages https://github.com/immortalwrt/packages.git;openwrt-23.05 +src-git luci https://github.com/immortalwrt/luci.git;openwrt-23.05 +src-git routing https://github.com/openwrt/routing.git;openwrt-23.05 +src-git telephony https://github.com/openwrt/telephony.git;openwrt-23.05 diff --git a/include/version.mk b/include/version.mk index 2dd42d4371..57a9ea05f6 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),23.05.0-rc1) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),23.05-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r26503-a5699b283d) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/23.05.0-rc1) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/23.05-SNAPSHOT) VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),ImmortalWrt) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index ac1d82b526..7677df96be 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -190,7 +190,7 @@ if VERSIONOPT config VERSION_REPO string prompt "Release repository" - default "https://downloads.immortalwrt.org/releases/23.05.0-rc1" + default "https://downloads.immortalwrt.org/releases/23.05-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: @@ -266,7 +266,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 600ff9519f..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r26503-a5699b283d diff --git a/version.date b/version.date deleted file mode 100644 index 063694bb86..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1685857988