]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
flash-images: Only install grub for EFI on aarch64
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jul 2018 12:59:07 +0000 (13:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Jul 2018 12:43:54 +0000 (13:43 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/flash-images

index 24cf327a525855c0ff21d92a70f27058ef4334a0..55ffd0e819047b6b763398f973a97f070062f3b1 100644 (file)
@@ -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