From 93ab8506e13dc6fc2a1c844c6e252b744ecbc047 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 22 Apr 2022 07:11:47 +0800 Subject: [PATCH] ImmortalWrt v21.02.0: 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 4e8ed641b4..9224c3c1f1 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/immortalwrt/packages.git^2e0126bd43ba24038abccbddd9f8ad0231137764 -src-git luci https://github.com/immortalwrt/luci.git^7bab2206656cfb55492b7a7faca842e69b21f721 -src-git routing https://github.com/openwrt/routing.git^b987eb3a9093f7fcf68d250d0c58f64ca13f0bc0 -src-git telephony https://github.com/openwrt/telephony.git^818a3776c78897bbe0ad04874c86533f285975af +src-git packages https://github.com/immortalwrt/packages.git;openwrt-21.02 +src-git luci https://github.com/immortalwrt/luci.git;openwrt-21.02 +src-git routing https://github.com/openwrt/routing.git;openwrt-21.02 +src-git telephony https://github.com/openwrt/telephony.git;openwrt-21.02 diff --git a/include/version.mk b/include/version.mk index f5474c92bd..187a7322ec 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),21.02.0) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19295-891f3af4fb) +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/21.02.0) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/21.02-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 200f405ba2..9e1e3ca805 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.immortalwrt.org/releases/21.02.0" + default "https://downloads.immortalwrt.org/releases/21.02-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 71f653f840..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r19295-891f3af4fb diff --git a/version.date b/version.date deleted file mode 100644 index e1dd39aad8..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1650530611