OpenWrt v23.05.2: adjust config defaults v23.05.2
authorHauke Mehrtens <hauke@hauke-m.de>
Tue, 14 Nov 2023 23:00:53 +0000 (00:00 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 14 Nov 2023 23:00:53 +0000 (00:00 +0100)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
feeds.conf.default
include/version.mk
package/base-files/image-config.in
version [new file with mode: 0644]
version.date [new file with mode: 0644]

index d467db5627f54306df553a40379734b74d0cca9a..035137eeba134677cca337ad092d9bcb1386d2d7 100644 (file)
@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05
+src-git packages https://git.openwrt.org/feed/packages.git^8e3a1824645f5e73ec44c897ac0755c53fb4a1f8
+src-git luci https://git.openwrt.org/project/luci.git^7739e9f5b03b830f51d53c384be4baef95054cb3
+src-git routing https://git.openwrt.org/feed/routing.git^83ef3784a9092cfd0a900cc28e2ed4e13671d667
+src-git telephony https://git.openwrt.org/feed/telephony.git^9746ae8f964e18f04b64fbe1956366954ff223f8
index 924bf8354121a357e641a14c13367822bdb3377e..dc1d75cc1617b17406e584c9c246d377fbcfe512 100644 (file)
@@ -23,13 +23,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),23.05-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),23.05.2)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r23630-842932a63d)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/23.05-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/23.05.2)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
index 9a72863813375657925f9eac9f7923902e973f08..2f8b9f31b5e296e990e30684919a403eae6deb24 100644 (file)
@@ -190,7 +190,7 @@ if VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository"
-               default "https://downloads.openwrt.org/releases/23.05-SNAPSHOT"
+               default "https://downloads.openwrt.org/releases/23.05.2"
                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 (file)
index 0000000..f949e81
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+r23630-842932a63d
diff --git a/version.date b/version.date
new file mode 100644 (file)
index 0000000..9279736
--- /dev/null
@@ -0,0 +1 @@
+1699969091