meshtasticd-debian: Include web components (#5778)

.gitignore

@@ -1,6 +1,8 @@
 .pio
-.pio_core
 pio
+pio.tar
+web
+web.tar
 
 # ignore vscode IDE settings files
 .vscode/*
@@ -32,4 +34,4 @@ release/
 .vscode/extensions.json
 /compile_commands.json
 src/mesh/raspihttp/certificate.pem
-src/mesh/raspihttp/private_key.pem
+src/mesh/raspihttp/private_key.pem

debian/changelog

@@ -1,4 +1,4 @@
-meshtasticd (2.5.19) unstable; urgency=medium
+meshtasticd (2.5.19) UNRELEASED; urgency=medium
 
   * Initial packaging
 

debian/ci_changelog.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 export DEBEMAIL="github-actions[bot]@users.noreply.github.com"
+PKG_VERSION=$(python3 bin/buildinfo.py short)
 
-dch --newversion "$(python3 bin/buildinfo.py short)-1" \
-        --distribution unstable \
-        "GitHub Actions Automatic version bump"
+dch --newversion "$PKG_VERSION-1" \
+	--distribution UNRELEASED \
+	"GitHub Actions Automatic version bump"

debian/ci_pack_sdeb.sh

@@ -4,11 +4,14 @@ export PLATFORMIO_LIBDEPS_DIR=pio/libdeps
 export PLATFORMIO_PACKAGES_DIR=pio/packages
 export PLATFORMIO_CORE_DIR=pio/core
 
-# Download libraries to `libdeps`
+# Download libraries to `pio`
 platformio pkg install -e native
-platformio pkg install -t platformio/tool-scons@4.40502.0
+platformio pkg install -e native -t platformio/tool-scons@4.40502.0
+# Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio
+# Download the latest meshtastic/web release build.tar to `web.tar`
+curl https://github.com/meshtastic/web/releases/download/latest/build.tar -o web.tar
 
 package=$(dpkg-parsechangelog --show-field Source)
 

debian/control

@@ -13,7 +13,11 @@ Build-Depends: debhelper-compat (= 13),
                libgpiod-dev,
                libbluetooth-dev,
                libusb-1.0-0-dev,
-               libi2c-dev
+               libi2c-dev,
+               openssl,
+               libssl-dev,
+               libulfius-dev,
+               liborcania-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no
@@ -23,4 +27,4 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Meshtastic daemon for communicating with Meshtastic devices
  Meshtastic is an off-grid text communication platform that uses inexpensive 
- LoRa radios.
+ LoRa radios.

debian/meshtasticd.dirs

@@ -1,3 +1,4 @@
 etc/meshtasticd
 etc/meshtasticd/config.d
 etc/meshtasticd/available.d
+usr/share/meshtasticd/web

debian/meshtasticd.install

@@ -4,3 +4,5 @@ bin/config.yaml                etc/meshtasticd
 bin/config.d/*                 etc/meshtasticd/available.d
 
 bin/meshtasticd.service        lib/systemd/system
+
+web/*                          usr/share/meshtasticd/web

debian/rules

@@ -12,9 +12,12 @@ PIO_ENV:=\
 	PLATFORMIO_PACKAGES_DIR=pio/packages
 
 override_dh_auto_build:
-	# Build with platformio
+	# Extract tarballs within source deb
 	tar -xf pio.tar
+	tar -xf web.tar web
+	gunzip web/ -r
+	# Build with platformio
 	$(PIO_ENV) platformio run -e native
 	# Move the binary and default config to the correct name
 	mv .pio/build/native/program .pio/build/native/meshtasticd
-	cp bin/config-dist.yaml bin/config.yaml
+	cp bin/config-dist.yaml bin/config.yaml

debian/source/include-binaries

@@ -1,3 +1,2 @@
-pio/libdeps
-pio/packages
-pio/core
+pio.tar
+web.tar

debian/source/options

@@ -1,2 +1 @@
-extend-diff-ignore = "\.pio\w*?$"
-tar-ignore = ""
+extend-diff-ignore = "\.pio"