Skip to content

Commit 8559cd7

Browse files
committed
Add second missing dir for arm grub efi
Signed-off-by: Itxaka <[email protected]>
1 parent 19927d0 commit 8559cd7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tools-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RUN luet install -y static/grub-artifacts --system-target /raw/grubartifacts
5757
# get them from the x86 repo and we want it to do it from the arm64 repo, even on x86
5858
# so we use the arm64 luet config and use that to install those on x86
5959
# This is being used by the prepare_arm_images.sh and build-arch-image.sh scripts
60-
RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-efi --system-target /arm/raw/grub
60+
RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-efi --system-target /arm/raw/grubefi
6161
RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-config --system-target /arm/raw/grubconfig
6262
RUN luet install --config /tmp/luet-arm64.yaml -y static/grub-artifacts --system-target /arm/raw/grubartifacts
6363

tools-image/build-arm-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ if [ -z "$EFI" ]; then
336336
exit 1
337337
fi
338338

339-
cp -rfv /efi/* $EFI
339+
cp -rfv /arm/raw/grubefi/* $EFI
340340
if [ -n "$EFI" ] && [ -n "$efi_dir" ]; then
341341
echo "Copy $efi_dir to EFI directory"
342342
cp -rfv $efi_dir/* $EFI

tools-image/prepare_arm_images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ mkdir -p $WORKDIR/tmpefi
3838

3939
# Create the EFI partition FAT16 and include the EFI image and a basic grub.cfg
4040
truncate -s $((20*1024*1024)) bootloader/efi.img
41-
cp -rfv /arm/raw/grub/* $WORKDIR/tmpefi
41+
cp -rfv /arm/raw/grubefi/* $WORKDIR/tmpefi
4242
mkfs.fat -F16 -n COS_GRUB bootloader/efi.img
4343
mcopy -s -i bootloader/efi.img $WORKDIR/tmpefi/EFI ::EFI
4444

0 commit comments

Comments
 (0)