From 53f29923e0a4cda27f6e1e3c298f7c0d4c6b8b35 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 18 Oct 2022 13:53:43 +0800 Subject: [PATCH] ImmortalWrt v21.02.2: adjust config defaults Signed-off-by: Tianling Shen --- feeds.conf.default | 8 ++++---- include/version.mk | 6 +++--- package/base-files/image-config.in | 2 +- package/emortal/default-settings/files/openwrt_banner | 2 +- version | 1 + version.date | 1 + 6 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 version create mode 100644 version.date diff --git a/feeds.conf.default b/feeds.conf.default index 9eece6fea2..ff2622f79a 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git-full packages https://github.com/immortalwrt/packages.git;openwrt-21.02 -src-git-full luci https://github.com/immortalwrt/luci.git;openwrt-21.02 -src-git-full routing https://github.com/openwrt/routing.git;openwrt-21.02 -src-git-full telephony https://github.com/openwrt/telephony.git;openwrt-21.02 +src-git-full packages https://github.com/immortalwrt/packages.git^97cadc2b6301460aae91c9b744631e27c0f454c6 +src-git-full luci https://github.com/immortalwrt/luci.git^dc88c6813733262e0a31a6aad917fbcdeac06c23 +src-git-full routing https://github.com/openwrt/routing.git^25e76489c83cfcee61e36a491896e1e9bfc3ec13 +src-git-full telephony https://github.com/openwrt/telephony.git^89cc8fccf757614eac1d45a684f4971393e0d984 diff --git a/include/version.mk b/include/version.mk index 187a7322ec..83c334825d 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-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02.2) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19616-49aba5fcac) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/21.02-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/21.02.2) 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 9e1e3ca805..acf0475b3d 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -259,7 +259,7 @@ if VERSIONOPT config VERSION_CODE_FILENAMES bool prompt "Revision code in filenames" - default y + default n 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/package/emortal/default-settings/files/openwrt_banner b/package/emortal/default-settings/files/openwrt_banner index 3f58fe67d9..6cf7f693b0 100644 --- a/package/emortal/default-settings/files/openwrt_banner +++ b/package/emortal/default-settings/files/openwrt_banner @@ -7,5 +7,5 @@ │ mm#mm # # # # # # "#m#" # "mm "mm"# "mm │ │ │ │─────────────────────────────────────────────│ -│ ImmortalWrt 21.02 │ +│ ImmortalWrt 21.02.2 │ └─────────────────────────────────────────────┘ diff --git a/version b/version new file mode 100644 index 0000000000..9616f03c93 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r19616-49aba5fcac diff --git a/version.date b/version.date new file mode 100644 index 0000000000..3e1bbdd855 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1665895881