Skip to content

Commit e4e9a15

Browse files
authored
Drop the Raspbian and Linux targets (meshtastic#3091)
* Drop the Raspbian and Linux targets * Add lovyanGFX libdep to native
1 parent 9211027 commit e4e9a15

File tree

5 files changed

+5
-29
lines changed

5 files changed

+5
-29
lines changed

.github/workflows/package_raspbian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
mkdir -p .debpkg/usr/sbin
4141
mkdir -p .debpkg/etc/meshtasticd
4242
mkdir -p .debpkg/usr/lib/systemd/system/
43-
cp release/meshtasticd_linux_arm64 .debpkg/usr/sbin/meshtasticd
43+
cp release/meshtasticd_linux .debpkg/usr/sbin/meshtasticd
4444
cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
4545
chmod +x .debpkg/usr/sbin/meshtasticd
4646
cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service

arch/portduino/portduino.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ lib_deps =
2323
${env.lib_deps}
2424
${networking_base.lib_deps}
2525
rweather/Crypto@^0.4.0
26+
lovyan03/LovyanGFX@^1.1.12
2627

2728
build_flags =
2829
${arduino_base.build_flags}

bin/build-native.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,7 @@ rm -r $OUTDIR/* || true
1414

1515
# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
1616
platformio pkg update
17-
18-
if command -v raspi-config &>/dev/null; then
19-
pio run --environment raspbian
20-
cp .pio/build/raspbian/program $OUTDIR/meshtasticd_linux_arm64
21-
else
22-
pio run --environment native
23-
cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
24-
fi
25-
17+
pio run --environment native
18+
cp .pio/build/native/program $OUTDIR/meshtasticd_linux
2619
cp bin/device-install.* $OUTDIR
2720
cp bin/device-update.* $OUTDIR

bin/native-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
cp release/meshtasticd_linux_arm64 /usr/sbin/meshtasticd
3+
cp release/meshtasticd_linux /usr/sbin/meshtasticd
44
mkdir /etc/meshtasticd
55
if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
66
cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml

variants/portduino/platformio.ini

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,4 @@ extends = portduino_base
33
build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
44
board = cross_platform
55
lib_deps = ${portduino_base.lib_deps}
6-
lovyan03/LovyanGFX@^1.1.12
7-
build_src_filter = ${portduino_base.build_src_filter}
8-
9-
; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
10-
[env:linux]
11-
extends = portduino_base
12-
build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
13-
board = linux_hardware
14-
lib_deps = ${portduino_base.lib_deps}
15-
build_src_filter = ${portduino_base.build_src_filter}
16-
17-
; The Raspberry Pi actually has accessible SPI and GPIO, so we can support real hardware there.
18-
[env:raspbian]
19-
extends = portduino_base
20-
build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino -DARCH_RASPBERRY_PI -lyaml-cpp
21-
board = linux_arm
22-
lib_deps = ${portduino_base.lib_deps}
23-
https://github.com/jp-bennett/LovyanGFX.git#jp-bennett-patch-1 ; lovyan03/LovyanGFX@^1.1.9
246
build_src_filter = ${portduino_base.build_src_filter}

0 commit comments

Comments
 (0)