diff --git a/feeds.conf.default b/feeds.conf.default index cbe63b1d13..226dc094b3 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/immortalwrt/packages.git^91619482df935954227e1fc12444fdb306bab585 -src-git luci https://github.com/immortalwrt/luci.git^401c185da643f376e9a2d2a6970b43ed9416560c -src-git routing https://github.com/openwrt/routing.git^c9b636698881059a3c981032770968f5a98ff201 -src-git telephony https://github.com/openwrt/telephony.git^fd605af7143165a2490681ec1752f259873b9147 +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 diff --git a/include/version.mk b/include/version.mk index 27d78a2028..80b1c1e570 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.1) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),24.10-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r33048-cc720ea55a71) +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/24.10.1) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/24.10-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 0f5ac40094..6a85139d6e 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.1" + default "https://downloads.immortalwrt.org/releases/24.10-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 0703420674..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r33048-cc720ea55a71 diff --git a/version.date b/version.date deleted file mode 100644 index c0450e2de4..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1744717122