提交: 57dfa297a2ac9b9faf9b3c7b539ac6f1df93c459 - immortalwrt-fa (git)

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt

Commit MetaInfo

• 修訂: 57dfa297a2ac9b9faf9b3c7b539ac6f1df93c459 (tree)
• 時間: 2022-04-22 08:11:47
• 作者: Tianling Shen <cnsztl@immo...>
• Commiter: Tianling Shen

Log Message

ImmortalWrt v21.02.0: adjust config defaults

Signed-off-by: Tianling Shen <[e-mail]>

Change Summary

• modified: feeds.conf.default
• modified: include/version.mk
• modified: package/base-files/image-config.in
• add: version
• add: version.date

差異

--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-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
+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

--- 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.0)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19295-891f3af4fb)
 
 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.immortalwrt.org/releases/21.02.0)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),ImmortalWrt)

--- 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-SNAPSHOT"
+		default "https://downloads.immortalwrt.org/releases/21.02.0"
 		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 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

--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r19295-891f3af4fb

--- /dev/null
+++ b/version.date
@@ -0,0 +1 @@
[phone]