diff --git a/feeds.conf.default b/feeds.conf.default index 226dc094b3..2d92a1686a 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/immortalwrt/packages.git;openwrt-24.10 -src-git luci https://github.com/immortalwrt/luci.git;openwrt-24.10 -src-git routing https://github.com/openwrt/routing.git;openwrt-24.10 -src-git telephony https://github.com/openwrt/telephony.git;openwrt-24.10 +src-git packages https://github.com/immortalwrt/packages.git^4e64a5891e40dab3a2ec2949cc6c4eb111905d86 +src-git luci https://github.com/immortalwrt/luci.git^314b140efc5d6e9eec69155330d84962887e464d +src-git routing https://github.com/openwrt/routing.git^84d97e684bcb6a63dbfdfbfd9ec7407192861239 +src-git telephony https://github.com/openwrt/telephony.git^fd605af7143165a2490681ec1752f259873b9147 diff --git a/include/version.mk b/include/version.mk index 80b1c1e570..b9ebfecca6 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),24.10-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),24.10.0-rc2) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32566-56e91d0bbea5) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/24.10-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/24.10.0-rc2) 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 6a85139d6e..6cd8165d99 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/24.10-SNAPSHOT" + default "https://downloads.immortalwrt.org/releases/24.10.0-rc2" 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 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/version b/version new file mode 100644 index 0000000000..c7ad2aada1 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r32566-56e91d0bbea5 diff --git a/version.date b/version.date new file mode 100644 index 0000000000..943de3a1b7 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1734764364