grub2/0342-util-grub-install.in-Fix-target-fo-qemu_mips.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

51 lines
1.7 KiB
Diff

From cfd149ef7abd7dedcfc558c2b3ba905a9ec87c43 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Apr 2013 15:10:29 +0200
Subject: [PATCH 342/482] * util/grub-install.in: Fix target fo
qemu_mips. Fix extension on EFI.
---
ChangeLog | 5 +++++
util/grub-install.in | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7e29788..2f55104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
+ * util/grub-install.in: Fix target fo qemu_mips.
+ Fix extension on EFI.
+
+2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/normal/menu_text.c (print_entry): Put an asterisk
in front of chosen entry to mark it even if highlighting is lost.
diff --git a/util/grub-install.in b/util/grub-install.in
index 32a3be3..271e447 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -673,13 +673,14 @@ fi
case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
sparc64-ieee1275) mkimage_target=sparc64-ieee1275-raw ;;
mipsel-loongson) mkimage_target=mipsel-loongson-elf ;;
+ mips-qemu_mips | mipsel-qemu_mips) mkimage_target="${grub_modinfo_target_cpu}-${grub_modinfo_platform}"-elf ;;
*) mkimage_target="${grub_modinfo_target_cpu}-${grub_modinfo_platform}" ;;
esac
case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
- i386-efi | x86_64-efi) imgext=efi ;;
+ i386-efi | x86_64-efi | ia64-efi) imgext=efi ;;
mipsel-loongson | i386-coreboot | i386-multiboot | i386-ieee1275 \
- | powerpc-ieee1275) imgext=elf ;;
+ | powerpc-ieee1275 | mips-qemu_mips | mipsel-qemu_mips) imgext=elf ;;
*) imgext=img ;;
esac
--
1.8.2.1