diff --git a/feeds.conf.default b/feeds.conf.default index 012766079ad..c28e51d2b22 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,5 +1,5 @@ -src-git packages https://git.openwrt.org/feed/packages.git^15884df50a89f522279451d04925f2d4467d16df -src-git luci https://git.openwrt.org/project/luci.git^946f77ac26de60b4f5209d4d33cf2bc0ef08f878 -src-git routing https://git.openwrt.org/feed/routing.git^b43e4ac560ccbafba21dc3ab0dbe57afc07e7b88 -src-git telephony https://git.openwrt.org/feed/telephony.git^40dcae69ef7f68352203ba0dd5b4f05c5d833d15 -src-git video https://github.com/openwrt/video.git^094bf58da6682f895255a35a84349a79dab4bf95 +src-git packages https://git.openwrt.org/feed/packages.git;openwrt-25.12 +src-git luci https://git.openwrt.org/project/luci.git;openwrt-25.12 +src-git routing https://git.openwrt.org/feed/routing.git;openwrt-25.12 +src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-25.12 +src-git video https://github.com/openwrt/video.git;openwrt-25.12 diff --git a/include/version.mk b/include/version.mk index e08f48f2d13..0f0d8b03128 100644 --- a/include/version.mk +++ b/include/version.mk @@ -27,13 +27,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),25.12.0-rc1) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32353-9e9b05130c) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12.0-rc1) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12-SNAPSHOT) VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 73560fbc978..5c3e1578463 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -198,7 +198,7 @@ if VERSIONOPT config VERSION_REPO string prompt "Release repository" - default "https://downloads.openwrt.org/releases/25.12.0-rc1" + default "https://downloads.openwrt.org/releases/25.12-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: @@ -280,7 +280,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 66b1da75594..00000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r32353-9e9b05130c diff --git a/version.date b/version.date deleted file mode 100644 index a59997d4fce..00000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1766089549