Merge pull request #229 from grische/bump_gluon_v2022.1.2

Bump Gluon to v2022.1.2
freifunkMUC · Jan 31, 2023 · cf747d6 · cf747d6
2 parents f59905b + e27f47c
commit cf747d6
Show file tree

Hide file tree

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

diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py
@@ -207,6 +207,7 @@ def render(self):
         'tp-link-tl-wr1043n-v5'
     ], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \
     exclude([
+        'd-link-dir825b1',
         'tp-link-re355-v1',
         'tp-link-re450-v1'
     ], pkglists=[PKGS_TLS])

diff --git a/site.mk b/site.mk
@@ -175,6 +175,7 @@ ifeq ($(GLUON_TARGET),ath79-generic)
     GLUON_tp-link-tl-wr842n-v3_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
     GLUON_tp-link-tl-wr1043nd-v4_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
     GLUON_tp-link-tl-wr1043n-v5_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_d-link-dir825b1_SITE_PACKAGES += $(EXCLUDE_TLS)
     GLUON_tp-link-re355-v1_SITE_PACKAGES += $(EXCLUDE_TLS)
     GLUON_tp-link-re450-v1_SITE_PACKAGES += $(EXCLUDE_TLS)
 endif