diff options
| author | Hauke Mehrtens | 2024-07-16 21:51:19 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2024-07-16 21:51:19 +0000 |
| commit | b9510660cebf46665aa0b74430b24306ebd0beed (patch) | |
| tree | 44f091daabf5330cf4be999a3d4643c24ace6e3b | |
| parent | d8dd03c46fd484dea9ea8f787a342de85e7cf7d3 (diff) | |
| download | openwrt-b9510660cebf46665aa0b74430b24306ebd0beed.tar.gz | |
OpenWrt v23.05.4: adjust config defaultsv23.05.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | feeds.conf.default | 8 | ||||
| -rw-r--r-- | include/version.mk | 6 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 4 | ||||
| -rw-r--r-- | version | 1 | ||||
| -rw-r--r-- | version.date | 1 |
5 files changed, 11 insertions, 9 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index d467db5627..d2d6aeea75 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -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^89955ee711d92e6fb6db7dde9d9d7eb06841acdb +src-git luci https://git.openwrt.org/project/luci.git^85dec609ab12eee92601d492e4d472b01d71f7ae +src-git routing https://git.openwrt.org/feed/routing.git^a82e34d5e402ec77fd5facc1349352cacda2d0f8 +src-git telephony https://git.openwrt.org/feed/telephony.git^98c8a5aa4624312ed758e2e2b6d4039050a1649d diff --git a/include/version.mk b/include/version.mk index 924bf83541..6b05c25acf 100644 --- a/include/version.mk +++ b/include/version.mk @@ -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.4) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r24012-d8dd03c46f) 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.4) 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 9a72863813..f69da17c46 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/23.05-SNAPSHOT" + default "https://downloads.openwrt.org/releases/23.05.4" 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..d7e2ab5631 --- /dev/null +++ b/version @@ -0,0 +1 @@ +r24012-d8dd03c46f diff --git a/version.date b/version.date new file mode 100644 index 0000000000..17ae036c5f --- /dev/null +++ b/version.date @@ -0,0 +1 @@ +1721081658 |