Bump Gluon to v2023.1.2

freifunkMUC · Jan 23, 2024 · e6bbc6a · e6bbc6a
1 parent 3af2a72
commit e6bbc6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 87 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.1
+GLUON_GIT_REF := v2023.1.2
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

diff --git a/patches/ath79-read-back-reset-register.patch b/patches/ath79-read-back-reset-register.patch
diff --git a/patches/targets-raspberry-pi-4.patch b/patches/targets-raspberry-pi-4.patch
@@ -14,12 +14,12 @@ index 00000000..ba631911
 +	},
 +})
 diff --git a/targets/targets.mk b/targets/targets.mk
-index 92b58ab8..05a74935 100644
+index d5f605aa..d27865b0 100644
 --- a/targets/targets.mk
 +++ b/targets/targets.mk
-@@ -22,5 +22,6 @@ $(eval $(call GluonTarget,x86,64))
+@@ -25,5 +25,6 @@ $(eval $(call GluonTarget,x86,64))
 
- ifneq ($(BROKEN),)
+ 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