Add org.meshtastic.meshtasticd

.github/workflows/ci.yaml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+    branches: [meshtasticd]
+  pull_request:
+
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-24.04
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+      with:
+        bundle: meshtasticd.flatpak
+        manifest-path: org.meshtastic.meshtasticd.yaml
+        cache-key: flatpak-builder-${{ github.sha }}

.gitignore

@@ -0,0 +1,5 @@
+.vscode/settings.json
+
+.flatpak
+.flatpak-builder
+build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared-modules"]
+	path = shared-modules
+	url = https://github.com/flathub/shared-modules.git

meshtasticd-wrapper.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+CONF_DIR="$XDG_CONFIG_HOME/meshtasticd"
+
+# Ensure conf directories exist
+mkdir -p "$CONF_DIR/config.d"
+mkdir -p "$CONF_DIR/available.d"
+
+# Always copy available.d config files
+cp -R /app/share/meshtasticd/available.d/* "$CONF_DIR/available.d/"
+
+# Copy default config if it doesn't exist
+if [ ! -f "$CONF_DIR/config.yaml" ]; then
+    echo "Copying default config to $CONF_DIR/config.yaml"
+    cp /app/share/meshtasticd/config-dist.yaml $CONF_DIR/config.yaml
+    sed -i 's|/usr/share/meshtasticd|/app/share/meshtasticd|g' $CONF_DIR/config.yaml
+    sed -i "s|/etc/meshtasticd|$CONF_DIR|g" $CONF_DIR/config.yaml
+fi
+
+exec meshtasticd "--fsdir=$XDG_DATA_HOME" "--config=$XDG_CONFIG_HOME/meshtasticd/config.yaml" "$@"

modules/i2c-tools.yaml

@@ -0,0 +1,8 @@
+name: i2c-tools
+buildsystem: simple
+build-commands:
+  - make PREFIX=${FLATPAK_DEST} install
+sources:
+  - type: archive
+    url: https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-4.4.tar.gz
+    sha256: af01d0fbe78e109a2db7137c7e9bfda3f3fb236c3177744c0f2695d1056cde71

modules/libevdev.yaml

@@ -0,0 +1,19 @@
+name: libevdev
+buildsystem: meson
+config-opts:
+  - -Dtests=disabled
+  - -Ddocumentation=disabled
+sources:
+  - type: archive
+    url: https://www.freedesktop.org/software/libevdev/libevdev-1.13.3.tar.xz
+    sha256: abf1aace86208eebdd5d3550ffded4c8d73bb405b796d51c389c9d0604cbcfbf
+    x-checker-data:
+      type: anitya
+      project-id: 20540
+      stable-only: true
+      url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz
+cleanup:
+  # - /bin
+  # - /include
+  # - /lib/pkgconfig
+  - /share/man

modules/libgpiod.yaml

@@ -0,0 +1,6 @@
+name: libgpiod
+buildsystem: autotools
+sources:
+  - type: archive
+    url: https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-2.2.tar.gz
+    sha256: ae35329db7027c740e90c883baf27c26311f0614e6a7b115771b28188b992aec

modules/libinput.yaml

@@ -0,0 +1,50 @@
+name: libinput
+buildsystem: meson
+config-opts:
+  - --libexec=lib
+  - -Dlibwacom=false
+  - -Ddebug-gui=false
+  - -Dtests=false
+  - -Ddocumentation=false
+  - -Dzshcompletiondir=no
+sources:
+  - type: archive
+    url: https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.27.0/libinput-1.27.0.tar.gz
+    sha256: b11b900bf88ef68fe688c107226bb453ef26faf461ae2dcf9690b00009d660a6
+    x-checker-data:
+      type: anitya
+      project-id: 5781
+      stable-only: true
+      url-template: https://gitlab.freedesktop.org/libinput/libinput/-/archive/$version/libinput-$version.tar.gz
+cleanup:
+  - /bin
+  - /etc
+  # - /lib/libinput
+  # - /lib/udev
+  - /share
+  # - /include
+  # - /lib/pkgconfig
+modules:
+  - name: mtdev
+    buildsystem: autotools
+    config-opts:
+      - --disable-static
+    sources:
+      - type: archive
+        url: https://bitmath.org/code/mtdev/mtdev-1.1.7.tar.bz2
+        sha256: a107adad2101fecac54ac7f9f0e0a0dd155d954193da55c2340c97f2ff1d814e
+        x-checker-data:
+          type: anitya
+          project-id: 8868
+          stable-only: true
+          url-template: https://bitmath.org/code/mtdev/mtdev-$version.tar.bz2
+      # Upstream uses an outdated version of the config.guess/config.sub script,
+      # so we override it here to fix aarch64 builds.
+      - type: shell
+        commands:
+          - cp -p /usr/share/automake-*/config.{sub,guess} config-aux/
+    cleanup:
+      - /bin
+      # - /include
+      # - /lib/*.la
+      # - /lib/pkgconfig

modules/xkbcommon.yaml

@@ -0,0 +1,16 @@
+name: xkbcommon
+buildsystem: meson
+config-opts:
+  - --buildtype=release
+  - -Ddefault_library=static
+  - -Denable-docs=false
+  - -Denable-tools=false
+  - -Denable-bash-completion=false
+  - -Dx-locale-root=/usr/share/X11/locale
+cleanup:
+  - /bin
+  - /libexec
+sources:
+  - type: archive
+    url: https://xkbcommon.org/download/libxkbcommon-1.6.0.tar.xz
+    sha256: 0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b

modules/yaml-cpp.yaml

@@ -0,0 +1,12 @@
+name: yaml-cpp
+buildsystem: cmake-ninja
+config-opts:
+  - -DBUILD_SHARED_LIBS=ON
+  - -DYAML_BUILD_SHARED_LIBS=ON
+  - -DYAML_CPP_BUILD_TOOLS=OFF
+  - -DYAML_CPP_BUILD_TESTS=OFF
+  - -DYAML_CPP_BUILD_CONTRIB=OFF
+sources:
+  - type: archive
+    url: https://github.com/jbeder/yaml-cpp/archive/refs/tags/0.8.0.tar.gz
+    sha256: fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16

org.meshtastic.meshtasticd.yaml

@@ -0,0 +1,58 @@
+id: org.meshtastic.meshtasticd
+runtime: org.freedesktop.Platform
+runtime-version: '24.08'
+sdk: org.freedesktop.Sdk
+command: meshtasticd-wrapper.sh
+modules:
+  - name: meshtasticd-wrapper
+    buildsystem: simple
+    build-commands:
+      - install -Dm755 meshtasticd-wrapper.sh /app/bin/meshtasticd-wrapper.sh
+    sources:
+      - type: file
+        path: meshtasticd-wrapper.sh
+  - python3-modules.json
+  - modules/yaml-cpp.yaml
+  - modules/libgpiod.yaml
+  - modules/i2c-tools.yaml
+  - shared-modules/libusb/libusb.json
+  - modules/libevdev.yaml
+  - modules/libinput.yaml
+  - modules/xkbcommon.yaml
+  - name: meshtasticd
+    buildsystem: simple
+    build-options:
+      build-args:
+        # PlatformIO requires internet access at build-time to download pkgs
+        - --share=network
+      env:
+        PLATFORMIO_BUILD_FLAGS: -L/app/lib
+    build-commands:
+      - platformio run -e native-tft
+      - install -Dm755 .pio/build/native/program /app/bin/meshtasticd
+      # Install the default config files and directories
+      - install -d /app/share/meshtasticd
+      - install -d /app/share/meshtasticd/config.d
+      - install -d /app/share/meshtasticd/available.d
+      - cp -R bin/config.d/* /app/share/meshtasticd/available.d
+      - install -m644 bin/config-dist.yaml /app/share/meshtasticd/config-dist.yaml
+    sources:
+      - type: git
+        url: https://github.com/meshtastic/firmware.git
+        # tag: v2.5.18.89ebafc
+        # commit: 89ebafc8b8d85ee12002b9c574f8472d99e9ec50
+        branch: '2.6'
+      - type: patch
+        paths:
+          - patches/stdcppfs.patch
+
+finish-args:
+  # Allow the app to talk to the X server
+  - --socket=x11
+  # Required for CH341 USB radio
+  - --device=usb
+  # Needs to talk to the network:
+  - --share=network
+  # Persist the meshtasticd configs
+  - --filesystem=xdg-config
+  - --filesystem=xdg-data

patches/stdcppfs.patch

@@ -0,0 +1,12 @@
+diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
+index aa1150e9..26377345 100644
+--- a/arch/portduino/portduino.ini
++++ b/arch/portduino/portduino.ini
+@@ -35,7 +35,6 @@ build_flags =
+   -DRADIOLIB_EEPROM_UNSUPPORTED
+   -DPORTDUINO_LINUX_HARDWARE
+   -lpthread
+-  -lstdc++fs
+   -lbluetooth
+   -lgpiod
+   -lyaml-cpp