From dfb1919e44f99c24d919793b89329a5957f596c1 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Wed, 1 Jan 2025 17:43:08 -0500
Subject: [PATCH] Update meshtastic, python-meshtastic

---
 .github/workflows/multi-arch-build.yml | 6 ++++++
 meshtasticd/Makefile                   | 4 ++--
 python-meshtastic/Makefile             | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/multi-arch-build.yml b/.github/workflows/multi-arch-build.yml
index b26379e..30db766 100644
--- a/.github/workflows/multi-arch-build.yml
+++ b/.github/workflows/multi-arch-build.yml
@@ -17,8 +17,13 @@ jobs:
   build:
     name: build ${{ matrix.arch }} ${{ github.ref_name }}
     runs-on: ubuntu-24.04
+    concurrency:
+      # Only run one build at a time (in case of multiple merges)
+      group: publish-builds
     strategy:
       fail-fast: false
+      # We can only run one build at a time due to the GitHub Pages deployment
+      # This should be revisited in the future, as it makes the build take *days*
       max-parallel: 1
       matrix:
         arch:
@@ -88,3 +93,4 @@ jobs:
           destination_dir: ${{ github.ref_name }}/${{ matrix.arch }}
           user_name: 'github-actions[bot]'
           user_email: 'github-actions[bot]@users.noreply.github.com'
+          enable_jekyll: true
diff --git a/meshtasticd/Makefile b/meshtasticd/Makefile
index b670d68..9ab5d33 100644
--- a/meshtasticd/Makefile
+++ b/meshtasticd/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meshtasticd
 PKG_VERSION:=2.5.18
-PKG_RELEASE:=1
-PKG_SOURCE_VERSION:=b12ac6d564be4558047231d5ad946a908dfbbd7f
+PKG_RELEASE:=2
+PKG_SOURCE_VERSION:=v2.5.18.89ebafc
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_PROTO:=git
diff --git a/python-meshtastic/Makefile b/python-meshtastic/Makefile
index 1eb12eb..45cd1d8 100644
--- a/python-meshtastic/Makefile
+++ b/python-meshtastic/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-meshtastic
-PKG_VERSION:=2.5.7
+PKG_VERSION:=2.5.9
 PKG_RELEASE:=1
 
 PYPI_NAME:=meshtastic
-PKG_HASH:=45e43e192e3a5467dd31f86a378efe4160efde1fdec29af91dc61ed369e33c5d
+PKG_HASH:=e0d90f18446605c232ad40d6903ffa6bce427d5c278443d254740a4bb2c8630c
 
 PKG_MAINTAINER:=Austin Lane <vidplace7@gmail.com>
 PKG_LICENSE:=GPL-3.0