Bump gluon to latest master

- remove redundant patch for RE305/RE355/RE450 - update build dependencies
freifunkMUC · Dec 14, 2023 · 213ce17 · 213ce17
1 parent eed2db3
commit 213ce17
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 75 deletions.
diff --git 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
diff --git a/patches/targets-drop-TP-Link-RE450-and-RE355.patch b/patches/targets-drop-TP-Link-RE450-and-RE355.patch
diff --git 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
@@ -33,6 +33,7 @@ apt-get -y --no-install-recommends install \
     patch \
     perl \
     python3 \
+    python3-distutils \
     qemu-utils \
     rsync \
     tar \
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ apt-get -y --no-install-recommends install \ @@
         patch \
         perl \
         python3 \
+        python3-distutils \
         qemu-utils \
         rsync \
         tar \
@@ Expand Down @@