From b591261e8206dc9a4a20fe8a68dc7d408d46ce7c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 20 Sep 2025 22:35:21 +0200 Subject: [PATCH] OpenWrt v24.10.3: adjust config defaults Signed-off-by: Hauke Mehrtens (cherry picked from commit dbd975a3b674c917d2f3b6663864084421944909) --- feeds.conf.default | 8 ++++---- include/version.mk | 4 ++-- package/base-files/image-config.in | 4 ++-- version | 1 + version.date | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 version create mode 100644 version.date diff --git a/feeds.conf.default b/feeds.conf.default index 770e1c7488..8346f59c09 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://github.com/openwrt/packages.git^e8a705e21e37c0c8b54750c3cb0df09056c704b9 -src-git luci https://github.com/openwrt/luci.git^6da5e65981734021932b8d339ce7a386eb8f8476 -src-git routing https://github.com/openwrt/routing.git^d8f9eab170bb63024596c4133c04a84a7aa8a454 -src-git telephony https://github.com/openwrt/telephony.git^2a4541d46199ac96fac214d02c908402831c4dc6 +src-git packages https://git.openwrt.org/feed/packages.git^44cff71992c291ae11b7b37606c70db62dc0674e +src-git luci https://git.openwrt.org/project/luci.git^923f8d991a49dc3d899fd24fc92ae7b1653ee4d0 +src-git routing https://git.openwrt.org/feed/routing.git^885ae6f9d0c0f47a1a6321e1cc7e9c7e20cc2681 +src-git telephony https://git.openwrt.org/feed/telephony.git^2a4541d46199ac96fac214d02c908402831c4dc6 diff --git a/include/version.mk b/include/version.mk index a2c07851f3..f1f8b11678 100644 --- a/include/version.mk +++ b/include/version.mk @@ -28,10 +28,10 @@ VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(VERSION_PRPLOS)) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r28872-daca7c049b) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/24.10-SNAPSHOT) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/24.10.3) 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 80db993d46..4521ebedb3 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.openwrt.org/releases/24.10-SNAPSHOT" + default "https://downloads.openwrt.org/releases/24.10.3" 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 y + default n 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 new file mode 100644 index 0000000000..38ffa1a0a1 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r28872-daca7c049b diff --git a/version.date b/version.date new file mode 100644 index 0000000000..8771692b91 --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1758316778