Use codexctl to download rootfs, add 3.20

Author: timower

.github/workflows/docker-image.yml

@@ -18,7 +18,16 @@ jobs:
       packages: write
     strategy:
       matrix:
-        fw_version: ['2.15.1', '3.3.2', '3.5.2', '3.8.3', '3.11.2']
+        os:
+          - version: '2.15.1.1189'
+            target: qemu-toltec
+          - version: '3.3.2.1666'
+            target: qemu-toltec
+          - version: '3.8.2.1965'
+            target: qemu-toltec
+          - version: '3.20.0.92'
+            target: qemu-base
+
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -37,17 +46,17 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
             latest=auto
-            suffix=-${{ matrix.fw_version }},onlatest=true
+            suffix=-${{matrix.os.target}}-${{ matrix.os.version }},onlatest=true
 
       - name: Build
         uses: docker/build-push-action@v5
         with:
           push: ${{ github.event_name != 'pull_request' && github.ref_name == 'main' }}
           tags: ${{ steps.meta.outputs.tags }}
-          target: qemu-toltec
+          target: ${{ matrix.os.target }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            fw_version=${{ matrix.fw_version }}
+            fw_version=${{ matrix.os.version }}
 
 

Dockerfile

@@ -39,30 +39,27 @@ FROM linuxkit/guestfs:f85d370f7a3b0749063213c2dd451020e3a631ab AS rootfs
 WORKDIR /opt
 ARG TARGETARCH
 
-# Install dependencies
-ADD https://github.com/jqlang/jq/releases/download/jq-1.7/jq-linux-${TARGETARCH} \
-    /usr/local/bin/jq
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
+# Install dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       git \
-      python3 \
-      python3-protobuf && \
-    chmod +x /usr/local/bin/jq && \
-    git clone https://github.com/ddvk/stuff.git /opt/stuff
-
-ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
-
-ADD get_update.sh /opt
-ADD updates.json /opt
+      build-essential \
+      pkg-config \
+      fuse \
+      libfuse-dev \
+      libz-dev && \
+    uv venv --python 3.13
 
 ARG fw_version
-RUN /opt/get_update.sh download $fw_version && \
-    python3 /opt/stuff/extractor/extractor.py /opt/fw.signed /opt/rootfs.ext4
+RUN uv pip install https://github.com/Jayy001/codexctl.git && \
+    .venv/bin/codexctl download $fw_version --hardware rm2 --out /tmp/firmware && \
+    .venv/bin/codexctl extract --out /opt/rootfs.ext4 /tmp/firmware/*
 
 # Make the rootfs image
 ADD make_rootfs.sh /opt
-RUN ./make_rootfs.sh /opt/rootfs.ext4
+RUN ./make_rootfs.sh /opt/rootfs.ext4 $fw_version
 
 # Step3: Qemu!
 FROM debian:bookworm AS qemu-debug
@@ -92,7 +89,7 @@ RUN run_vm -serial null -daemonize && \
 VOLUME /opt/root
 
 # SSH access
-EXPOSE 22/tcp
+EXPOSE 2222/tcp
 # Qemu monitor TCP port
 EXPOSE 5555/tcp
 # For rm2fb

make_rootfs.sh

@@ -3,6 +3,29 @@
 set -eux
 
 ROOTFS=$1
+FW_VERSION=${2:-""}
+
+# Extract major.minor version for comparison
+get_version_parts() {
+    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
+}
 
 qemu-img create -f qcow2 rootfs.qcow2 8G
 
@@ -26,14 +49,23 @@ download /etc/fstab /tmp/fstab
 ! sed -i 's/mmcblk2/mmcblk1/' /tmp/fstab
 upload /tmp/fstab /etc/fstab
 
-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
-
 mount /dev/sda4 /home
 cp-a /etc/skel /home/root
 
 ln-s /dev/null /etc/systemd/system/remarkable-fail.service
 
 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
+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)"
+fi