From 5396dd1d7eb85fa0f560d060d2f80958a83dfef0 Mon Sep 17 00:00:00 2001
From: Bo Lorentsen <bl@lue.dk>
Date: Sat, 24 Oct 2026 18:52:23 +0200
Subject: [PATCH] Give each kas repo its own path (all three shared extern/,
 clobbering each other)

---
 .config.yaml                | 12 +++++++-----
 .gitea/workflows/build.yaml | 14 ++++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.config.yaml b/.config.yaml
index acfa2dc..4c1babf 100644
--- a/.config.yaml
+++ b/.config.yaml
@@ -12,13 +12,13 @@ target: rpilinux-image
 
 repos:
   meta-raspberrypi:
-    url: http://git.yoctoproject.org/git/meta-raspberrypi
-    path: extern/
+    url: https://git.yoctoproject.org/git/meta-raspberrypi
+    path: extern/meta-raspberrypi
     tag: scarthgap
   poky:
-    url: http://git.yoctoproject.org/git/poky
+    url: https://git.yoctoproject.org/git/poky
     tag: scarthgap
-    path: extern/
+    path: extern/poky
     layers:
       meta:
       meta-poky:
@@ -26,7 +26,7 @@ repos:
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
     tag: scarthgap
-    path: extern/
+    path: extern/meta-openembedded
     layers:
       meta-oe:
       meta-multimedia:
@@ -34,6 +34,8 @@ repos:
       meta-python:
   local:
     path: meta-rpilinux
+  local:
+    path: meta-rpilinux
 
 local_conf_header:
   ipk: |
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 4f9abbf..22f1e9f 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -92,15 +92,21 @@ jobs:
           set -euo pipefail
           export YOCTO_HOME="${YOCTO_HOME:-$HOME/yocto-build}"
           cd "$YOCTO_HOME/yocto_rpi"
-          IMG_DIR="build/*/tmp/deploy/images/raspberrypi4-64"
-          ls -lh $IMG_DIR
+          IMG_DIR="$(find build -type d -path '*/tmp/deploy/images/raspberrypi4-64' | head -1)"
+          if [ -z "$IMG_DIR" ]; then
+            echo "::error::no deploy dir found under build/"
+            exit 1
+          fi
+          echo "images in: $IMG_DIR"
+          ls -lh "$IMG_DIR"
           mkdir -p "$GITEA_WORKSPACE/dist"
-          cp $IMG_DIR/* "$GITEA_WORKSPACE/dist/"
+          # only the image artefacts, not the million symlinks/cache dirs
+          find "$IMG_DIR" -maxdepth 1 -type f \( -name '*.wic*' -o -name '*.ext4*' -o -name '*.rootfs*' -o -name '*.tar.bz2' -o -name '*.dtb' -o -name 'Image*' -o -name 'modules*' \) -exec cp -av {} "$GITEA_WORKSPACE/dist/" \;
           {
             echo "## RPi4 image built"
             echo
             echo "- commit: ${GITEA_SHA}"
-            echo "- images also on the runner host at: \`$YOCTO_HOME/yocto_rpi/$IMG_DIR\`"
+            echo "- build tree on runner host: \`$YOCTO_HOME/yocto_rpi/$IMG_DIR\`"
           } >> "$GITEA_STEP_SUMMARY"
 
       - name: Upload images