7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
27 lines
940 B
Diff
27 lines
940 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Tue, 6 Feb 2018 11:16:28 +0100
|
|
Subject: [PATCH] Don't attempt to backtrace on grub_abort() for grub-emu
|
|
|
|
The emu platform doesn't have a grub_backtrace() implementation, so this
|
|
causes a build error. Don't attempt to call this when building grub-emu.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
grub-core/kern/misc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
|
index 04371ac49f2..636f97e1ba1 100644
|
|
--- a/grub-core/kern/misc.c
|
|
+++ b/grub-core/kern/misc.c
|
|
@@ -1103,7 +1103,7 @@ static void __attribute__ ((noreturn))
|
|
grub_abort (void)
|
|
{
|
|
#ifndef GRUB_UTIL
|
|
-#if defined(__i386__) || defined(__x86_64__)
|
|
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_EMU)
|
|
grub_backtrace();
|
|
#endif
|
|
#endif
|