From 9c89426ac8849ba23effa53ccfc6e3c32c5f9b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Joz=C3=ADfek?= Date: Tue, 14 May 2024 16:32:54 +0200 Subject: [PATCH] Update the image base version and fix Pi5 AMA0 device error --- image_builder/image_builder.py | 6 +++--- prusa/link/data/image_builder/manager-start-script.sh | 4 ++-- prusa/link/data/image_builder/prusalink-start-script.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/image_builder/image_builder.py b/image_builder/image_builder.py index 96eced4e..4e4b209c 100644 --- a/image_builder/image_builder.py +++ b/image_builder/image_builder.py @@ -18,7 +18,7 @@ KERNEL_URL = ("http://security.debian.org/debian-security/pool/updates/main/l/" - "linux/linux-image-6.1.0-17-armmp-lpae_6.1.69-1_armhf.deb") + "linux/linux-image-6.1.0-21-armmp-lpae_6.1.90-1_armhf.deb") match = KERNEL_URL_REGEX.match(KERNEL_URL) if match is None: @@ -31,8 +31,8 @@ VMLINUZ_NAME = f"vmlinuz-{KERNEL_VERSION_NAME}" IMAGE_URL = ("https://downloads.raspberrypi.org/raspios_lite_armhf/images/" - "raspios_lite_armhf-2023-12-11/" - "2023-12-11-raspios-bookworm-armhf-lite.img.xz") + "raspios_lite_armhf-2024-03-15/" + "2024-03-15-raspios-bookworm-armhf-lite.img.xz") DATA_FILE = "data.json" COMPRESSED_IMAGE_NAME = "source_image.img.xz" diff --git a/prusa/link/data/image_builder/manager-start-script.sh b/prusa/link/data/image_builder/manager-start-script.sh index 113a2608..de130d8b 100644 --- a/prusa/link/data/image_builder/manager-start-script.sh +++ b/prusa/link/data/image_builder/manager-start-script.sh @@ -5,11 +5,11 @@ iptables -t nat -I OUTPUT -p tcp -o lo -d localhost --dport 80 -j REDIRECT --to- set_up_port () { # Sets the baudrate and cancels the hangup at the end of a connection - stty -F "$1" 115200 -hupcl; + stty -F "$1" 115200 -hupcl || true } message() { - printf "M117 $2\n" > "$1" + printf "M117 $2\n" > "$1" || true } wifi_nic_name=$(find /sys/class/net -follow -maxdepth 2 -name wireless 2> /dev/null | cut -d / -f 5) diff --git a/prusa/link/data/image_builder/prusalink-start-script.sh b/prusa/link/data/image_builder/prusalink-start-script.sh index c9bb61a3..ad128332 100644 --- a/prusa/link/data/image_builder/prusalink-start-script.sh +++ b/prusa/link/data/image_builder/prusalink-start-script.sh @@ -5,11 +5,11 @@ iptables -t nat -I OUTPUT -p tcp -o lo -d localhost --dport 80 -j REDIRECT --to- set_up_port () { # Sets the baudrate and cancels the hangup at the end of a connection - stty -F "$1" 115200 -hupcl; + stty -F "$1" 115200 -hupcl || true } message() { - printf "M117 $2\n" > "$1" + printf "M117 $2\n" > "$1" || true } wifi_nic_name=$(find /sys/class/net -follow -maxdepth 2 -name wireless 2> /dev/null | cut -d / -f 5)