From b8e296b14b74dfa792c3212d6401ee19349dd4e7 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 2 Jan 2024 00:12:04 +0100 Subject: [PATCH 1/4] modules: update openwrt 05f74354bd lua5.3: fix typo calling lua53 instead of lua5.3 for Package Default --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 08c8d06063..2110f803fb 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='gluon packages routing' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-22.03 -OPENWRT_COMMIT=1f7ca927b788c180135b7708138e94386bb958b4 +OPENWRT_COMMIT=05f74354bd43efe9d08c0ce0db3fb0ef37ada94e PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=dc99bbb906f9faae472e48da013dbf67e1a00c23 From f0f288a949acf9255a582791445b3d715fa18f01 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 2 Jan 2024 00:12:12 +0100 Subject: [PATCH 2/4] modules: update packages 8661c3722 mosquitto: update to 2.0.18 69c7e53ab php8: update to 8.1.27 f39d7eab8 curl: update to 8.5.0 396aace59 php8: update to 8.1.26 638fb4aab https-dns-proxy: only restart firewall when needed --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 2110f803fb..750aeabf66 100644 --- a/modules +++ b/modules @@ -9,7 +9,7 @@ PACKAGES_GLUON_COMMIT=dc99bbb906f9faae472e48da013dbf67e1a00c23 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=e34369a41b522a49dec9fb1d81b4ee6b32b731d8 +PACKAGES_PACKAGES_COMMIT=444cedf4ff7a3cd6bc60bdc83f9f33ab7fcc4eac PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 From a9d4ea2ef40132fd88bfe09e436cf3bdc18d3781 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 2 Jan 2024 00:12:15 +0100 Subject: [PATCH 3/4] modules: update gluon 53ea3b8 libplatforminfo: update bcm27xx target name 28a35ea libplatforminfo: drop obsolete ar71xx-mikrotik target --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 750aeabf66..3ca5a01f87 100644 --- a/modules +++ b/modules @@ -5,7 +5,7 @@ OPENWRT_BRANCH=openwrt-22.03 OPENWRT_COMMIT=05f74354bd43efe9d08c0ce0db3fb0ef37ada94e PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=dc99bbb906f9faae472e48da013dbf67e1a00c23 +PACKAGES_GLUON_COMMIT=53ea3b89771fc7d7a80f1800ce25e98dfe1633aa PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 From 609903cba6f8d29e75c64f7dad06ef44b70c6cf4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 19 Dec 2023 18:41:37 +0100 Subject: [PATCH 4/4] bcm27xx: update manifest aliases (#3110) As the boardname-based image name setting was broken for bcm27xx due to the target rename, we need to keep the model-based names updated for now. Add all model strings currently seen on the Multimeshviewer and update the comments accordingly. (cherry picked from commit 20c2adae9763c4dfd143406129ce101c68daf15f) [adjust comment from 2023.1 to 2023.1.1] Signed-off-by: Tom Herbers --- targets/bcm27xx-bcm2708 | 3 ++- targets/bcm27xx-bcm2709 | 2 +- targets/bcm27xx-bcm2710 | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/targets/bcm27xx-bcm2708 b/targets/bcm27xx-bcm2708 index d35866ce82..5ce91347b4 100644 --- a/targets/bcm27xx-bcm2708 +++ b/targets/bcm27xx-bcm2708 @@ -5,7 +5,8 @@ device('raspberrypi-model-b', 'rpi', { 'raspberrypi-model-b-plus', 'raspberrypi-model-b-rev2', - -- from Gluon 2019.1 and older + -- from Gluon 2023.1.1 and older + 'raspberry-pi-model-b-rev-1', 'raspberry-pi-model-b-rev-2', 'raspberry-pi-model-b-plus-rev-1.2', }, diff --git a/targets/bcm27xx-bcm2709 b/targets/bcm27xx-bcm2709 index 5c9bd999ba..79fcd6c9fa 100644 --- a/targets/bcm27xx-bcm2709 +++ b/targets/bcm27xx-bcm2709 @@ -2,7 +2,7 @@ include 'bcm27xx.inc' device('raspberrypi-2-model-b', 'rpi-2', { manifest_aliases = { - -- from Gluon 2019.1 and older + -- from Gluon 2023.1.1 and older 'raspberry-pi-2-model-b-rev-1.1', }, }) diff --git a/targets/bcm27xx-bcm2710 b/targets/bcm27xx-bcm2710 index 9c641cd0f0..2d1a05ebe9 100644 --- a/targets/bcm27xx-bcm2710 +++ b/targets/bcm27xx-bcm2710 @@ -4,7 +4,8 @@ device('raspberrypi-3-model-b', 'rpi-3', { manifest_aliases = { 'raspberrypi-3-model-b-plus', - -- from Gluon 2019.1 and older + -- from Gluon 2023.1.1 and older 'raspberry-pi-3-model-b-rev-1.2', + 'raspberry-pi-3-model-b-plus-rev-1.3', }, })