From eed2db3f64af73b89d222f68d081352175f30b36 Mon Sep 17 00:00:00 2001 From: Grische Date: Wed, 13 Dec 2023 16:25:44 +0100 Subject: [PATCH 1/4] contrib: remove RE305 from genpkglist --- contrib/genpkglist.py | 1 - site.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py index 97e7ff98..78cb875c 100755 --- a/contrib/genpkglist.py +++ b/contrib/genpkglist.py @@ -277,7 +277,6 @@ def render(self): 'netgear-r6120', 'ravpower-rp-wd009'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \ exclude([ - 'tp-link-re305' ], pkglists=[PKGS_TLS]) for target in ['x86-64', 'x86-generic', 'x86-geode']: diff --git a/site.mk b/site.mk index 9636e60f..075f337b 100644 --- a/site.mk +++ b/site.mk @@ -274,7 +274,6 @@ ifeq ($(GLUON_TARGET),ramips-mt76x8) GLUON_gl.inet-microuter-n300_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_netgear-r6120_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) GLUON_ravpower-rp-wd009_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) - GLUON_tp-link-re305_SITE_PACKAGES += $(EXCLUDE_TLS) endif # no pkglists for target realtek-rtl838x From 213ce17203a8a82d7d568ca87ddead41fe9114e0 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Thu, 7 Dec 2023 19:50:03 +0100 Subject: [PATCH 2/4] Bump gluon to latest master - remove redundant patch for RE305/RE355/RE450 - update build dependencies --- Makefile | 2 +- patches/targets-drop-TP-Link-RE305.patch | 28 ------------- ...targets-drop-TP-Link-RE450-and-RE355.patch | 41 ------------------- patches/targets-raspberry-pi-4.patch | 11 ++--- scripts/install_build_dependencies.sh | 1 + 5 files changed, 8 insertions(+), 75 deletions(-) delete mode 100644 patches/targets-drop-TP-Link-RE305.patch delete mode 100644 patches/targets-drop-TP-Link-RE450-and-RE355.patch diff --git a/Makefile b/Makefile index 0bc392f6..109e10ea 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2023.1 +GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13 PATCH_DIR := ./patches SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/patches/targets-drop-TP-Link-RE305.patch b/patches/targets-drop-TP-Link-RE305.patch deleted file mode 100644 index c183e57d..00000000 --- a/patches/targets-drop-TP-Link-RE305.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 30742c681eccafd2a47fa705b47ce730ffe178d8 Mon Sep 17 00:00:00 2001 -From: Grische <10663446-grische@users.noreply.gitlab.com> -Date: Fri, 3 Nov 2023 00:27:40 +0100 -Subject: [PATCH] targets: drop TP-Link RE305 - -The flash size is not sufficient to host updated packages ---- - targets/ramips-mt76x8 | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/targets/ramips-mt76x8 b/targets/ramips-mt76x8 -index 52fb71be..1e27ac35 100644 ---- a/targets/ramips-mt76x8 -+++ b/targets/ramips-mt76x8 -@@ -62,10 +62,6 @@ device('tp-link-re200-v2', 'tplink_re200-v2') - - device('tp-link-re200-v3', 'tplink_re200-v3') - --device('tp-link-re305', 'tplink_re305-v1', { -- class = 'tiny', -- Only 6M of usable Firmware space --}) -- - device('tp-link-tl-mr3020-v3', 'tplink_tl-mr3020-v3', { - factory = false, - extra_images = { --- -2.25.1 - diff --git a/patches/targets-drop-TP-Link-RE450-and-RE355.patch b/patches/targets-drop-TP-Link-RE450-and-RE355.patch deleted file mode 100644 index 563c885b..00000000 --- a/patches/targets-drop-TP-Link-RE450-and-RE355.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b5fb157e3b67b2d39f5b7c391ef39f0b19e4cf2e Mon Sep 17 00:00:00 2001 -From: Christian -Date: Fri, 18 Aug 2023 17:02:22 +0200 -Subject: [PATCH] targets: drop TP-Link RE450 and RE355 - -The flash size is not sufficient to host the minimal set of FFMuc packages ---- - targets/ath79-generic | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/targets/ath79-generic b/targets/ath79-generic -index 7a5140c9..32a03ce3 100644 ---- a/targets/ath79-generic -+++ b/targets/ath79-generic -@@ -474,23 +474,6 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', { - packages = ATH10K_PACKAGES_QCA9888, - }) - --device('tp-link-re355-v1', 'tplink_re355-v1', { -- manifest_aliases = { -- 'tp-link-re355', -- upgrade from OpenWrt 19.07 -- }, -- packages = ATH10K_PACKAGES_SMALLBUFFERS_QCA9880, -- broken = true, -- OOM with 5GHz enabled in most environments if device is 64M RAM variant -- class = 'tiny', -- Only 6M of usable Firmware space --}) -- --device('tp-link-re450-v1', 'tplink_re450-v1', { -- packages = ATH10K_PACKAGES_QCA9880, -- manifest_aliases = { -- 'tp-link-re450', -- upgrade from OpenWrt 19.07 -- }, -- class = 'tiny', -- Only 6M of usable Firmware space --}) -- - device('tp-link-tl-wdr3500-v1', 'tplink_tl-wdr3500-v1') - device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1') - device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1') --- -2.25.1 - diff --git a/patches/targets-raspberry-pi-4.patch b/patches/targets-raspberry-pi-4.patch index 0c71d24b..644f7f40 100644 --- a/patches/targets-raspberry-pi-4.patch +++ b/patches/targets-raspberry-pi-4.patch @@ -3,11 +3,12 @@ new file mode 100644 index 00000000..ba631911 --- /dev/null +++ b/targets/bcm27xx-bcm2711 -@@ -0,0 +1,9 @@ +@@ -0,0 +1,10 @@ +include 'bcm27xx.inc' + -+device('raspberry-pi-4-model-b', 'rpi-4', { ++device('raspberrypi-4-model-b', 'rpi-4', { + manifest_aliases = { ++ 'raspberry-pi-4-model-b', + 'raspberry-pi-4-model-b-rev-1.1', + 'raspberry-pi-4-model-b-rev-1.2', + 'raspberry-pi-4-model-b-rev-1.4', @@ -17,9 +18,9 @@ diff --git a/targets/targets.mk b/targets/targets.mk index 92b58ab8..05a74935 100644 --- a/targets/targets.mk +++ b/targets/targets.mk -@@ -22,5 +22,6 @@ $(eval $(call GluonTarget,x86,64)) - - ifneq ($(BROKEN),) +@@ -26,5 +26,6 @@ $(eval $(call GluonTarget,x86,64)) + + ifeq ($(BROKEN),1) $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested +$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: Untested $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support diff --git a/scripts/install_build_dependencies.sh b/scripts/install_build_dependencies.sh index a0f7f268..b39e49a4 100755 --- a/scripts/install_build_dependencies.sh +++ b/scripts/install_build_dependencies.sh @@ -33,6 +33,7 @@ apt-get -y --no-install-recommends install \ patch \ perl \ python3 \ + python3-distutils \ qemu-utils \ rsync \ tar \ From 9adfc3ca42bfe9293c35859f5edcb466970c746d Mon Sep 17 00:00:00 2001 From: Grische Date: Wed, 13 Dec 2023 16:25:56 +0100 Subject: [PATCH 3/4] contrib: replace openssl with mbedtls OpenWRT 23.05 is using mbedtls again --- contrib/genpkglist.py | 2 +- site.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py index 78cb875c..dcbb4a5a 100755 --- a/contrib/genpkglist.py +++ b/contrib/genpkglist.py @@ -180,7 +180,7 @@ def render(self): PKGS_TLS = PackageList('TLS', [ 'ca-bundle', - 'libustream-openssl' + 'libustream-mbedtls' ]) pkglists.append(PKGS_TLS) diff --git a/site.mk b/site.mk index 075f337b..fb47929d 100644 --- a/site.mk +++ b/site.mk @@ -153,11 +153,11 @@ EXCLUDE_PCI_NET := \ INCLUDE_TLS := \ ca-bundle \ - libustream-openssl + libustream-mbedtls EXCLUDE_TLS := \ -ca-bundle \ - -libustream-openssl + -libustream-mbedtls ifeq ($(GLUON_TARGET),ath79-generic) GLUON_SITE_PACKAGES += $(INCLUDE_TLS) From 284ed9c3f9eaa53bbc6564ed5060db9ae76c8c35 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:42:44 +0100 Subject: [PATCH 4/4] targets: add mediatek-filogic --- site.mk | 3 +++ targets | 1 + 2 files changed, 4 insertions(+) diff --git a/site.mk b/site.mk index fb47929d..ea59d759 100644 --- a/site.mk +++ b/site.mk @@ -232,6 +232,9 @@ ifeq ($(GLUON_TARGET),lantiq-xway) endif +# no pkglists for target mediatek-filogic + + ifeq ($(GLUON_TARGET),mediatek-mt7622) GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE) diff --git a/targets b/targets index 65e85c3a..9eaf5891 100644 --- a/targets +++ b/targets @@ -10,6 +10,7 @@ ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway +mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020