mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Sat, 12 May 2018 11:29:07 +0200
|
|
Subject: [PATCH] Don't attempt to export the start and _start symbols for
|
|
grub-emu
|
|
|
|
Commit 318ee04aadc ("make better backtraces") reworked the backtrace logic
|
|
but the changes lead to the following build error on the grub-emu platform:
|
|
|
|
grub_emu_lite-symlist.o:(.data+0xf08): undefined reference to `start'
|
|
collect2: error: ld returned 1 exit status
|
|
make[3]: *** [Makefile:25959: grub-emu-lite] Error 1
|
|
make[3]: *** Waiting for unfinished jobs....
|
|
cat kernel_syms.input | grep -v '^#' | sed -n \
|
|
-e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/defined kernel '""'\1/;p;}' \
|
|
-e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/defined kernel '""'\1/;p;}' \
|
|
| sort -u >kernel_syms.lst
|
|
|
|
The problem is that start and _start symbols are exported unconditionally,
|
|
but these aren't defined for grub-emu since is an emultaed platform so it
|
|
doesn't have a startup logic. Don't attempt to export those for grub-emu.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
include/grub/kernel.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
|
|
index ae69218af20..9548d552aad 100644
|
|
--- a/include/grub/kernel.h
|
|
+++ b/include/grub/kernel.h
|
|
@@ -108,8 +108,10 @@ grub_addr_t grub_modules_get_end (void);
|
|
|
|
#endif
|
|
|
|
+#if !defined(GRUB_MACHINE_EMU)
|
|
void EXPORT_FUNC(start) (void);
|
|
void EXPORT_FUNC(_start) (void);
|
|
+#endif
|
|
|
|
/* The start point of the C code. */
|
|
void grub_main (void) __attribute__ ((noreturn));
|