From 7dc377c1bfe902bbc4a1aad803a215d160677de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20K=C3=B6hl?= <mail@koehlma.de>
Date: Fri, 7 Jun 2024 17:26:43 +0200
Subject: [PATCH] fix: copy boot files correctly for Raspberry Pi

---
 .../core/recipes/rpi-alpine-setup/steps/00-install.sh       | 6 ++++--
 .../core/recipes/rpi-debian-setup/steps/01-install.sh       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bakery/repositories/core/recipes/rpi-alpine-setup/steps/00-install.sh b/bakery/repositories/core/recipes/rpi-alpine-setup/steps/00-install.sh
index 0832966..88ef9d7 100755
--- a/bakery/repositories/core/recipes/rpi-alpine-setup/steps/00-install.sh
+++ b/bakery/repositories/core/recipes/rpi-alpine-setup/steps/00-install.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-BOOT_DIR="${RUGPI_BUNDLE_DIR}/roots/boot"
+BOOT_DIR="${RUGPI_BUNDLE_DIR}/roots/boot/"
 
 apk add linux-rpi
 
+mkdir -p "${BOOT_DIR}"
+
 cp -rp /boot/* "${BOOT_DIR}"
-cp -rp "${RECIPE_DIR}/files/boot/" "${BOOT_DIR}"
+cp -rp "${RECIPE_DIR}/files/boot/"* "${BOOT_DIR}"
diff --git a/bakery/repositories/core/recipes/rpi-debian-setup/steps/01-install.sh b/bakery/repositories/core/recipes/rpi-debian-setup/steps/01-install.sh
index 4c8dc17..f615471 100755
--- a/bakery/repositories/core/recipes/rpi-debian-setup/steps/01-install.sh
+++ b/bakery/repositories/core/recipes/rpi-debian-setup/steps/01-install.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-BOOT_DIR="${RUGPI_BUNDLE_DIR}/roots/boot"
+BOOT_DIR="${RUGPI_BUNDLE_DIR}/roots/boot/"
 
 install -m 644 "${RECIPE_DIR}/files/raspberrypi.list" "/etc/apt/sources.list.d/"
 sed -i "s/RELEASE/bookworm/g" "/etc/apt/sources.list.d/raspberrypi.list"
@@ -22,4 +22,4 @@ install -m 644 "${RECIPE_DIR}/files/cmdline.txt" "/boot/firmware/"
 install -m 644 "${RECIPE_DIR}/files/config.txt" "/boot/firmware/"
 
 mkdir -p "${BOOT_DIR}"
-cp -rp /boot/firmware/ "${BOOT_DIR}"
+cp -rp /boot/firmware/* "${BOOT_DIR}"