fix: copy boot files correctly for Raspberry Pi

silitics · Jun 7, 2024 · 7dc377c · 7dc377c
1 parent 22b9adf
commit 7dc377c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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}"