From: Michael Tremer Date: Thu, 12 Jul 2018 12:59:07 +0000 (+0100) Subject: flash-images: Only install grub for EFI on aarch64 X-Git-Tag: v2.21-core124~77^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5c92f50bfcecb8496216c82b41d4dd4b7d78635;p=people%2Fstevee%2Fipfire-2.x.git flash-images: Only install grub for EFI on aarch64 Signed-off-by: Michael Tremer --- diff --git a/lfs/flash-images b/lfs/flash-images index 24cf327a52..55ffd0e819 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -195,13 +195,15 @@ ifeq "$(BOOTLOADER)" "grub" sed -i $(MNThdd)/boot/grub/grub.cfg \ -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" +ifeq "$(BUILD_PLATFORM)" "x86" # Install GRUB grub-install --force --recheck --no-floppy --target=i386-pc \ --root-directory=$(MNThdd) $(DEVICE) +endif ifeq "$(EFI)" "1" # Install GRUB for EFI - grub-install --target=$(BUILD_ARCH)-efi --removable --no-nvram \ + grub-install --target=$(GRUB_ARCH)-efi --removable --no-nvram \ --boot-directory=$(MNThdd)/boot --efi-directory=$(MNThdd)/boot/efi endif