Fixup

mattiaswal · mattiaswal · commit 63192c73a3a1 · 2025-08-28T08:10:18.000+02:00
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -14,17 +14,19 @@ on:
         description: 'Use latest release artifacts instead of workflow artifacts'
         type: boolean
         default: false
-
+  pull_request:
+    types: [labeled]
 jobs:
   create-image:
     name: Create SD Card Image for ${{ inputs.board }}
     runs-on: ubuntu-latest
+    #runs-on: [ self-hosted, latest ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           clean: true
-          fetch-depth: 1
+          fetch-depth: 0
           submodules: recursive
 
       - name: Install dependencies
@@ -38,6 +40,8 @@ jobs:
             qemu-utils \
             dosfstools \
             e2fsprogs \
+            genext2fs \
+            mtools \
             jq
 
       - name: Prepare build environment
@@ -48,7 +52,8 @@ jobs:
 
       - name: Set bootloader and target based on board
         run: |
-          case "${{ inputs.board }}" in
+          #case "${{ inputs.board }}" in
+          case "raspberry-pi-4" in
             raspberry-pi-4)
               echo "BOOTLOADER=rpi4_boot" >> $GITHUB_ENV
               echo "TARGET=aarch64" >> $GITHUB_ENV
@@ -64,17 +69,18 @@ jobs:
         if: ${{ !inputs.use_latest_release }}
         run: |
           # Download from latest bootloader build workflow on main branch
-          gh run list --workflow=build-boot.yml --branch=main --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_boot_run_id
+          #gh run list --workflow=build-boot.yml --branch=main --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_boot_run_id
+          gh run list --workflow=build-boot.yml --branch=create-sdcard --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_boot_run_id
           BOOT_RUN_ID=$(cat latest_boot_run_id)
-          
+
           gh run download ${BOOT_RUN_ID} --name artifact-${BOOTLOADER} --dir temp_bootloader/
-          
+
           # Extract bootloader directly to output/images
           cd temp_bootloader/
           tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
           cd ../
           rm -rf temp_bootloader/
-          
+
           echo "Bootloader files extracted to output/images:"
           ls -la output/images/
         env:
@@ -83,18 +89,18 @@ jobs:
       - name: Download Infix artifacts
         if: ${{ !inputs.use_latest_release }}
         run: |
-          # Download from latest Infix build workflow for main branch
-          gh run list --workflow=build.yml --branch=main --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_infix_run_id
+          # Download from latest Kernelkit Trigger workflow for main branch
+          gh run list --workflow=164295764 --branch=main --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_infix_run_id
           INFIX_RUN_ID=$(cat latest_infix_run_id)
-          
+
           gh run download ${INFIX_RUN_ID} --name artifact-${TARGET} --dir temp_infix/
-          
+
           # Extract Infix directly to output/images
           cd temp_infix/
           tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
           cd ../
           rm -rf temp_infix/
-          
+
           echo "Infix files extracted to output/images:"
           ls -la output/images/
         env:
@@ -109,14 +115,14 @@ jobs:
           tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
           cd ../
           rm -rf temp_bootloader/
-          
+
           # Download latest Infix release
           gh release download latest --pattern "*${TARGET}*" --dir temp_infix/
           cd temp_infix/
           tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
           cd ../
           rm -rf temp_infix/
-          
+
           echo "All files extracted to output/images:"
           ls -la output/images/
         env:
@@ -135,10 +141,13 @@ jobs:
           export BINARIES_DIR=$PWD/output/images
           export BUILD_DIR=$PWD/build
           export BR2_EXTERNAL_INFIX_PATH=$PWD
-          
+          export RELEASE=""
+          export INFIX_ID="infix"
+
           # Use the standardized mkimage.sh path for the selected board
-          BOARD_SCRIPT="src/board/${{ inputs.board }}/mkimage.sh"
-          
+          #          BOARD_SCRIPT="src/board/${{ inputs.board }}/mkimage.sh"
+          BOARD_SCRIPT="src/board/raspberry-pi-4/mkimage.sh"
+
           if [ -f "$BOARD_SCRIPT" ]; then
             echo "Using board-specific image creation script: $BOARD_SCRIPT"
             chmod +x "$BOARD_SCRIPT"
@@ -152,7 +161,7 @@ jobs:
         run: |
           echo "Contents of output/images after mkimage.sh:"
           ls -lh output/images/
-          
+
           # Look for SD card image with pattern: *-sdcard.img
           if ls output/images/*-sdcard.img 1> /dev/null 2>&1; then
             echo "Found SD card image(s):"
@@ -201,15 +210,15 @@ jobs:
         run: |
           cat <<EOF >> $GITHUB_STEP_SUMMARY
           # SD Card Image Build Complete! 🚀
-          
+
           **Board:** ${{ inputs.board }}
-          **Target:** ${{ env.TARGET }}  
+          **Target:** ${{ env.TARGET }}
           **Bootloader:** ${{ env.BOOTLOADER }}
           **Artifact Source:** ${{ inputs.use_latest_release && 'Latest Release' || 'Latest Workflow Run' }}
-          
+
           ## Created Images
           $(find output/images/ -name "*.img" -o -name "*.qcow2" -o -name "*.raw" | xargs ls -lh 2>/dev/null | sed 's/^/- /' || echo "- No images found")
-          
+
           ## Download
           The SD card image is available as a workflow artifact above.
-          EOF
+          EOF
diff --git a/configs/rpi4_boot_defconfig b/configs/rpi4_boot_defconfig
@@ -35,3 +35,4 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 # GNS3_APPLIANCE is not set
+SDCARD_AUX=y
diff --git a/src/board/raspberry-pi-4/mkimage.sh b/src/board/raspberry-pi-4/mkimage.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+set -e
+#. "$BR2_CONFIG" 2>/dev/null
+
+BOARD_DIR=$(dirname "$0")
+GENIMAGE_CFG="${BUILD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+# Device trees are installed for distro boot (syslinux.conf), but on RPi
+# we need them for the SPL, which feeds the TPL (U-Boot) for use instead
+# of the (built-in) control DT other platforms use.
+#find "${TARGET_DIR}/boot" -type f -name '*.dtb' -exec cp '{}' "${BINARIES_DIR}/" \;
+
+# We've asked U-Boot previously to build overlays for us: Infix signing
+# key and our ixboot scripts.  Make sure here they are installed in the
+# proper directory so genimage can create the DOS partition the SPL
+# reads config.txt from.
+find "${BINARIES_DIR}" -type f -name '*.dtbo' -exec mv '{}' "${BINARIES_DIR}/rpi-firmware/overlays/" \;
+
+# Create FILES array for the genimage.cfg generation
+FILES=""
+for f in "${BINARIES_DIR}"/rpi-firmware/*; do
+    case "$f" in
+        *~|*.bak) continue ;;
+    esac
+    echo "${FILES}" | grep -q `basename $f` && continue # If already exist it has been added by us.
+    FILES="${FILES}\t\t\t\"${f#"${BINARIES_DIR}/"}\",\n"
+done
+
+echo $FILES
+KERNEL=$(sed -n 's/^kernel=//p' "${BINARIES_DIR}/rpi-firmware/config.txt")
+FILES="${FILES}\t\t\t\"${KERNEL}\""
+
+
+sed "s|#BOOT_FILES#|${FILES}|" "${BOARD_DIR}/genimage.cfg.in" | \
+sed "s|#INFIX_ID#|${INFIX_ID}|" | \
+sed "s|#VERSION#|${RELEASE}|" > "${GENIMAGE_CFG}"
+
+
+ROOTPATH_TMP=$(mktemp -d)
+trap 'rm -rf \"$ROOTPATH_TMP\"' EXIT
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage					\
+    --rootpath   "${ROOTPATH_TMP}"		\
+    --tmppath    "${GENIMAGE_TMP}"		\
+    --inputpath  "${BINARIES_DIR}"		\
+    --outputpath "${BINARIES_DIR}"		\
+    --config     "${GENIMAGE_CFG}"
