Merge pull request #83 from Itxaka/other_missing_dir

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
 

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

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