From 704d999d5a37d4200c32b40f7abb067e520d7ceb Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 21 Jan 2026 01:24:27 +0100 Subject: [PATCH] OpenWrt v25.12.0-rc3: revert to branch defaults Signed-off-by: Hauke Mehrtens --- feeds.conf.default | 10 +++++----- include/version.mk | 6 +++--- package/base-files/image-config.in | 4 ++-- version | 1 - version.date | 1 - 5 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 version delete mode 100644 version.date diff --git a/feeds.conf.default b/feeds.conf.default index 84d9fd60d4..c28e51d2b2 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,5 +1,5 @@ -src-git packages https://git.openwrt.org/feed/packages.git^594c3c8c8c5b7e98fd9d4d0cce7905324f18384a -src-git luci https://git.openwrt.org/project/luci.git^8d9defc6a2b0a283f3595503e4aae597e6f684d0 -src-git routing https://git.openwrt.org/feed/routing.git^b43e4ac560ccbafba21dc3ab0dbe57afc07e7b88 -src-git telephony https://git.openwrt.org/feed/telephony.git^2618106d5846a4a542fdf5809f0d3ed228ce439b -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 7be22a125b..0f0d8b0312 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-rc3) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32486-30527a4c34) +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-rc3) +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 fac52c8f9f..5c3e157846 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-rc3" + 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 8604077eed..0000000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -r32486-30527a4c34 diff --git a/version.date b/version.date deleted file mode 100644 index 5e5a90ddcf..0000000000 --- a/version.date +++ /dev/null @@ -1 +0,0 @@ -1768954854