diff options
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | configs/os/boot-config/v3-hdmi-rpi4.txt | 2 | ||||
| -rw-r--r-- | configs/os/boot-config/v4mini-hdmi-rpi4.txt | 2 | ||||
| -rw-r--r-- | configs/os/boot-config/v4plus-hdmi-rpi4.txt | 2 | ||||
| -rw-r--r-- | kvmd.install | 5 |
5 files changed, 8 insertions, 5 deletions
@@ -200,7 +200,7 @@ for _variant in "${_variants[@]}"; do cd \"kvmd-\$pkgver\" pkgdesc=\"PiKVM platform configs - $_platform for $_board\" - depends=(kvmd=$pkgver-$pkgrel \"linux-rpi-pikvm>=5.15.68-3\") + depends=(kvmd=$pkgver-$pkgrel \"linux-rpi-pikvm>=6.6.21-3\") backup=( etc/sysctl.d/99-kvmd.conf diff --git a/configs/os/boot-config/v3-hdmi-rpi4.txt b/configs/os/boot-config/v3-hdmi-rpi4.txt index f2078e79..e9ec5038 100644 --- a/configs/os/boot-config/v3-hdmi-rpi4.txt +++ b/configs/os/boot-config/v3-hdmi-rpi4.txt @@ -19,4 +19,4 @@ dtoverlay=spi0-1cs dtparam=i2c_arm=on # Clock -dtoverlay=i2c-rtc,pcf8563 +dtoverlay=i2c-rtc,pcf8563,wakeup-source diff --git a/configs/os/boot-config/v4mini-hdmi-rpi4.txt b/configs/os/boot-config/v4mini-hdmi-rpi4.txt index abb8e006..7664187d 100644 --- a/configs/os/boot-config/v4mini-hdmi-rpi4.txt +++ b/configs/os/boot-config/v4mini-hdmi-rpi4.txt @@ -18,4 +18,4 @@ dtoverlay=tc358743-audio dtparam=i2c_arm=on # Clock -dtoverlay=i2c-rtc,pcf8563 +dtoverlay=i2c-rtc,pcf8563,wakeup-source diff --git a/configs/os/boot-config/v4plus-hdmi-rpi4.txt b/configs/os/boot-config/v4plus-hdmi-rpi4.txt index c2a2a2a9..3728ab39 100644 --- a/configs/os/boot-config/v4plus-hdmi-rpi4.txt +++ b/configs/os/boot-config/v4plus-hdmi-rpi4.txt @@ -22,4 +22,4 @@ disable_overscan=1 dtparam=i2c_arm=on # Clock -dtoverlay=i2c-rtc,pcf8563 +dtoverlay=i2c-rtc,pcf8563,wakeup-source diff --git a/kvmd.install b/kvmd.install index 38158715..b46f548f 100644 --- a/kvmd.install +++ b/kvmd.install @@ -56,7 +56,7 @@ post_upgrade() { echo "==> Patching configs ..." - if [[ "$(vercmp "$1" 3.301)" -lt 0 ]]; then + if [[ "$(vercmp "$2" 3.301)" -lt 0 ]]; then [ ! -f /etc/fstab ] || (sed -i -e "s|,data=journal||g" /etc/fstab && touch -t 200701011000 /etc/fstab) [ ! -f /etc/fstab ] || (sed -i -e "/tmpfs \/run\s/d" /etc/fstab && touch -t 200701011000 /etc/fstab) [ ! -f /etc/pacman.conf ] || sed -i -e "s|^Server = https://pikvm.org/repos/|Server = https://files.pikvm.org/repos/arch/|g" /etc/pacman.conf @@ -67,6 +67,9 @@ post_upgrade() { [ ! -f /etc/pam.d/system-auth ] || sed -i -e '/\<pam_systemd_home\.so\>/ s/^#*/#/' /etc/pam.d/system-auth [ -e /etc/systemd/network/99-default.link ] || ln -s /dev/null /etc/systemd/network/99-default.link fi + if [[ "$(vercmp "$2" 3.317)" -lt 0 ]]; then + [ ! -f /boot/config.txt ] || sed -i -e 's/^dtoverlay=i2c-rtc,pcf8563$/dtoverlay=i2c-rtc,pcf8563,wakeup-source/g' /boot/config.txt + fi # Some update deletes /etc/motd, WTF # shellcheck disable=SC2015,SC2166 |