Merge pull request #327 from grische/feature/bump-gluon

Bump gluon to latest master (OpenWRT 23.05)

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

contrib/genpkglist.py

@@ -180,7 +180,7 @@ def render(self):
 
 PKGS_TLS = PackageList('TLS', [
     'ca-bundle',
-    'libustream-openssl'
+    'libustream-mbedtls'
 ])
 pkglists.append(PKGS_TLS)
 
@@ -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']:

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

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 \

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)
@@ -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)
 
@@ -274,7 +277,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

targets

@@ -10,6 +10,7 @@ ipq40xx-mikrotik
 ipq806x-generic
 lantiq-xrx200
 lantiq-xway
+mediatek-filogic
 mediatek-mt7622
 mpc85xx-p1010
 mpc85xx-p1020