Skip to content

Commit 02f9e71

Browse files
committed
OpenWrt v25.12.0-rc1: revert to branch defaults
Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent b1a74b1 commit 02f9e71

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

feeds.conf.default

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
src-git packages https://git.openwrt.org/feed/packages.git^15884df50a89f522279451d04925f2d4467d16df
2-
src-git luci https://git.openwrt.org/project/luci.git^946f77ac26de60b4f5209d4d33cf2bc0ef08f878
3-
src-git routing https://git.openwrt.org/feed/routing.git^b43e4ac560ccbafba21dc3ab0dbe57afc07e7b88
4-
src-git telephony https://git.openwrt.org/feed/telephony.git^40dcae69ef7f68352203ba0dd5b4f05c5d833d15
5-
src-git video https://github.com/openwrt/video.git^094bf58da6682f895255a35a84349a79dab4bf95
1+
src-git packages https://git.openwrt.org/feed/packages.git;openwrt-25.12
2+
src-git luci https://git.openwrt.org/project/luci.git;openwrt-25.12
3+
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-25.12
4+
src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-25.12
5+
src-git video https://github.com/openwrt/video.git;openwrt-25.12

include/version.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ PKG_CONFIG_DEPENDS += \
2727
sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
2828

2929
VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
30-
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12.0-rc1)
30+
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT)
3131

3232
VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
33-
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32353-9e9b05130c)
33+
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
3434

3535
VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
36-
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12.0-rc1)
36+
VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12-SNAPSHOT)
3737

3838
VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
3939
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)

package/base-files/image-config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ if VERSIONOPT
198198
config VERSION_REPO
199199
string
200200
prompt "Release repository"
201-
default "https://downloads.openwrt.org/releases/25.12.0-rc1"
201+
default "https://downloads.openwrt.org/releases/25.12-SNAPSHOT"
202202
help
203203
This is the repository address embedded in the image, it defaults
204204
to the trunk snapshot repo; the url may contain the following placeholders:
@@ -280,7 +280,7 @@ if VERSIONOPT
280280
config VERSION_CODE_FILENAMES
281281
bool
282282
prompt "Revision code in filenames"
283-
default n
283+
default y
284284
help
285285
Enable this to include the revision identifier or the configured
286286
version code into the firmware image, SDK- and Image Builder archive

version

Lines changed: 0 additions & 1 deletion
This file was deleted.

version.date

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)