Parcourir la source

OpenWrt v25.12.0-rc3: adjust config defaults

Signed-off-by: Hauke Mehrtens <[email protected]>
Hauke Mehrtens il y a 2 semaines
Parent
commit
f94b2bc1bd
5 fichiers modifiés avec 12 ajouts et 10 suppressions
  1. 5 5
      feeds.conf.default
  2. 3 3
      include/version.mk
  3. 2 2
      package/base-files/image-config.in
  4. 1 0
      version
  5. 1 0
      version.date

+ 5 - 5
feeds.conf.default

@@ -1,5 +1,5 @@
-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
+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

+ 3 - 3
include/version.mk

@@ -27,13 +27,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12.0-rc3)
 
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r32486-30527a4c34)
 
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12.0-rc3)
 
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)

+ 2 - 2
package/base-files/image-config.in

@@ -198,7 +198,7 @@ if VERSIONOPT
 	config VERSION_REPO
 	config VERSION_REPO
 		string
 		string
 		prompt "Release repository"
 		prompt "Release repository"
-		default "https://downloads.openwrt.org/releases/25.12-SNAPSHOT"
+		default "https://downloads.openwrt.org/releases/25.12.0-rc3"
 		help
 		help
 			This is the repository address embedded in the image, it defaults
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
 			to the trunk snapshot repo; the url may contain the following placeholders:
@@ -280,7 +280,7 @@ if VERSIONOPT
 	config VERSION_CODE_FILENAMES
 	config VERSION_CODE_FILENAMES
 		bool
 		bool
 		prompt "Revision code in filenames"
 		prompt "Revision code in filenames"
-		default y
+		default n
 		help
 		help
 			Enable this to include the revision identifier or the configured
 			Enable this to include the revision identifier or the configured
 			version code into the firmware image, SDK- and Image Builder archive
 			version code into the firmware image, SDK- and Image Builder archive

+ 1 - 0
version

@@ -0,0 +1 @@
+r32486-30527a4c34

+ 1 - 0
version.date

@@ -0,0 +1 @@
+1768954854