From 8559cd70c09843c63f2f80d77f4e50e6c461047b Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 31 Jul 2023 22:19:11 +0200 Subject: [PATCH] Add second missing dir for arm grub efi Signed-off-by: Itxaka --- tools-image/Dockerfile | 2 +- tools-image/build-arm-image.sh | 2 +- tools-image/prepare_arm_images.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile index b62f63c..9d82a0c 100644 --- a/tools-image/Dockerfile +++ b/tools-image/Dockerfile @@ -57,7 +57,7 @@ RUN luet install -y static/grub-artifacts --system-target /raw/grubartifacts # get them from the x86 repo and we want it to do it from the arm64 repo, even on x86 # so we use the arm64 luet config and use that to install those on x86 # This is being used by the prepare_arm_images.sh and build-arch-image.sh scripts -RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-efi --system-target /arm/raw/grub +RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-efi --system-target /arm/raw/grubefi RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-config --system-target /arm/raw/grubconfig RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-artifacts --system-target /arm/raw/grubartifacts diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh index 3689540..4db399f 100755 --- a/tools-image/build-arm-image.sh +++ b/tools-image/build-arm-image.sh @@ -336,7 +336,7 @@ if [ -z "$EFI" ]; then exit 1 fi -cp -rfv /efi/* $EFI +cp -rfv /arm/raw/grubefi/* $EFI if [ -n "$EFI" ] && [ -n "$efi_dir" ]; then echo "Copy $efi_dir to EFI directory" cp -rfv $efi_dir/* $EFI diff --git a/tools-image/prepare_arm_images.sh b/tools-image/prepare_arm_images.sh index 96824d8..4f5de43 100755 --- a/tools-image/prepare_arm_images.sh +++ b/tools-image/prepare_arm_images.sh @@ -38,7 +38,7 @@ mkdir -p $WORKDIR/tmpefi # Create the EFI partition FAT16 and include the EFI image and a basic grub.cfg truncate -s $((20*1024*1024)) bootloader/efi.img -cp -rfv /arm/raw/grub/* $WORKDIR/tmpefi +cp -rfv /arm/raw/grubefi/* $WORKDIR/tmpefi mkfs.fat -F16 -n COS_GRUB bootloader/efi.img mcopy -s -i bootloader/efi.img $WORKDIR/tmpefi/EFI ::EFI