Add 3.20 toltec support

Author: timower

.github/workflows/docker-image.yml

@@ -57,7 +57,7 @@ jobs:
           - version: '3.8.2.1965'
             target: qemu-toltec
           - version: '3.20.0.92'
-            target: qemu-base
+            target: qemu-toltec
 
     steps:
       - name: Set up Docker Buildx

Dockerfile

@@ -114,6 +114,8 @@ RUN run_vm -serial null -daemonize && \
     wait_ssh && \
     in_vm 'while ! timedatectl status | grep "synchronized: yes"; do sleep 1; done' && \
     in_vm wget https://raw.githubusercontent.com/toltec-dev/toltec/testing/scripts/bootstrap/bootstrap && \
+    in_vm 'sed -i "s|wget_remote=.*|wget_remote=https://github.com/Azathothas/Static-Binaries/raw/main/wget/wget_busybox_armv7l_abihf_musl_Linux|" bootstrap' && \
+    in_vm 'sed -i "s/wget_checksum=.*/wget_checksum=ec215780dc74381fd5464d11b1e8efe9736f332acb237706c90720b4baa641ca/" bootstrap' && \
     in_vm env bash bootstrap --force && \
     save_vm
 

make_rootfs.sh

@@ -7,24 +7,24 @@ FW_VERSION=${2:-""}
 
 # Extract major.minor version for comparison
 get_version_parts() {
-    echo "$1" | cut -d '.' -f 1,2
+  echo "$1" | cut -d '.' -f 1,2
 }
 
 # Check if firmware version is >= 3.12
 should_skip_dhcpcd() {
-    if [ -z "$FW_VERSION" ]; then
-        return 1  # Don't skip if no version provided
-    fi
-    
-    version_parts=$(get_version_parts "$FW_VERSION")
-    major=$(echo "$version_parts" | cut -d '.' -f 1)
-    minor=$(echo "$version_parts" | cut -d '.' -f 2)
-    
-    if [ "$major" -gt 3 ] || ([ "$major" -eq 3 ] && [ "$minor" -ge 12 ]); then
-        return 0  # Skip dhcpcd modification
-    else
-        return 1  # Don't skip
-    fi
+  if [ -z "$FW_VERSION" ]; then
+    return 1 # Don't skip if no version provided
+  fi
+
+  version_parts=$(get_version_parts "$FW_VERSION")
+  major=$(echo "$version_parts" | cut -d '.' -f 1)
+  minor=$(echo "$version_parts" | cut -d '.' -f 2)
+
+  if [ "$major" -gt 3 ] || ([ "$major" -eq 3 ] && [ "$minor" -ge 12 ]); then
+    return 0 # Skip dhcpcd modification
+  else
+    return 1 # Don't skip
+  fi
 }
 
 qemu-img create -f qcow2 rootfs.qcow2 8G
@@ -47,6 +47,8 @@ mount /dev/sda2 /
 
 download /etc/fstab /tmp/fstab
 ! sed -i 's/mmcblk2/mmcblk1/' /tmp/fstab
+! sed -i 's/unknown/mmcblk1p4/' /tmp/fstab
+! sed -i 's/,noauto,x-systemd.after=xochitl.service,x-systemd.device-timeout=0//' /tmp/fstab
 upload /tmp/fstab /etc/fstab
 
 mount /dev/sda4 /home
@@ -58,14 +60,14 @@ GFS
 
 # Handle dhcpcd.service modification for firmware versions < 3.12
 if ! should_skip_dhcpcd; then
-    echo "Modifying dhcpcd.service for firmware version $FW_VERSION"
-    guestfish --rw --add rootfs.qcow2 <<DHCPCD_GFS
+  echo "Modifying dhcpcd.service for firmware version $FW_VERSION"
+  guestfish --rw --add rootfs.qcow2 <<DHCPCD_GFS
 run
 mount /dev/sda2 /
 download /lib/systemd/system/dhcpcd.service /tmp/dhcpcd.service
 ! sed -i 's/wlan/eth/' /tmp/dhcpcd.service
 upload /tmp/dhcpcd.service /lib/systemd/system/dhcpcd.service
 DHCPCD_GFS
 else
-    echo "Skipping dhcpcd.service modification for firmware version $FW_VERSION (>= 3.12)"
+  echo "Skipping dhcpcd.service modification for firmware version $FW_VERSION (>= 3.12)"
 fi