Skip to content

Commit b1d4c14

Browse files
authored
remove pigpio, installed rgpiod (#2090)
1 parent de4d300 commit b1d4c14

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

build-image/first-boot.bash

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,12 @@ if is_trixie || is_bookworm && is_pi; then # attention no brackets => left-assoc
107107
systemctl enable --now NetworkManager
108108
nmcli g
109109
nmcli r wifi on
110-
nmcli g
111-
nmcli r wifi on
112-
nmcli g
113110

114111
if [[ -n $wifiSSID ]]; then
115112
# Setup WiFi via NetworkManager
116113
# shellcheck source=/etc/openhabian.conf disable=SC2154
117114
nmcli g
118115
nmcli -w 30 d wifi connect "${wifiSSID}" password "${wifiPassword}" ifname wlan0
119-
nmcli g
120-
nmcli -w 30 d wifi connect "${wifiSSID}" password "${wifiPassword}" ifname wlan0
121-
nmcli g
122116
fi
123117
elif grep -qs "up" /sys/class/net/eth0/operstate; then
124118
# Actually check if ethernet is working

functions/system.bash

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,15 @@ needed_packages() {
6868
# Install python3/python3-pip/python3-wheel/python3-setuptools - for python packages
6969
echo -n "$(timestamp) [openHABian] Installing additional needed packages... "
7070
if cond_redirect apt-get -o DPkg::Lock::Timeout="$APTTIMEOUT" install --yes apt-transport-https avahi-daemon bc jq mbpoll \
71-
moreutils python3 python3-pip python3-wheel python3-setuptools sysstat \
72-
fontconfig; \
73-
then echo "OK"; else echo "FAILED"; return 1; fi
71+
moreutils python3 python3-pip python3-wheel python3-setuptools sysstat fontconfig; then echo "OK"; else echo "FAILED"; return 1; fi
7472
if is_pi_wlan && [[ -z $PREOFFLINE ]]; then
7573
echo -n "$(timestamp) [openHABian] Installing python3 serial package... "
76-
if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" python3-smbus python3-serial; then echo "OK"; else echo "FAILED"; return 1; fi
74+
if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" python3-smbus python3-serial; then echo "OK"; else echo "FAILED"; fi
7775
echo -n "$(timestamp) [openHABian] Installing pigpio package... "
78-
if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" pigpio; then echo "OK"; else echo "FAILED"; return 1; fi
76+
if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" rgpiod; then echo "OK"; else echo "FAILED"; fi
7977
echo -n "$(timestamp) [openHABian] Installing additional bluetooth packages... "
8078
if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" bluez python3-dev libbluetooth-dev \
81-
raspberrypi-sys-mods pi-bluetooth; \
82-
then echo "OK"; else echo "FAILED"; return 1; fi
79+
raspberrypi-sys-mods pi-bluetooth; then echo "OK"; else echo "FAILED"; fi
8380
fi
8481
}
8582

@@ -455,9 +452,8 @@ change_swapsize() {
455452
((size/=1024))
456453

457454
echo -n "$(timestamp) [openHABian] Adjusting swap size to $size MB... "
458-
if ! cond_redirect dphys-swapfile swapoff; then echo "FAILED (swapoff)"; return 1; fi
459-
if ! cond_redirect sed -i 's|^#*.*CONF_SWAPSIZE=.*$|CONF_SWAPSIZE='"${size}"'|g' /etc/dphys-swapfile; then echo "FAILED (swapfile)"; return 1; fi
460-
if cond_redirect dphys-swapfile swapon; then echo "OK (reboot required)"; else echo "FAILED (swapon)"; return 1; fi
455+
# TBD
456+
# dphys-swapfile is no longer available in trixie
461457
}
462458

463459
## Reduce the RPi GPU memory to the minimum to allow for the system to utilize

0 commit comments

Comments
 (0)