Commit 0ba90a7f0178 ("efi: Move grub_reboot() into kernel") broke the build on i386-efi - genmoddep.awk bails out with message grub_reboot in reboot is duplicated in kernel This is because both lib/i386/reset.c and kern/efi/efi.c now provide this function.
Rather than explicitly list each i386 platform variant in Makefile.core.def, include the contents of lib/i386/reset.c only when GRUB_MACHINE_EFI is not set. Signed-off-by: Leif Lindholm <leif.lindh...@linaro.org> --- grub-core/lib/i386/reboot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/grub-core/lib/i386/reboot.c b/grub-core/lib/i386/reboot.c index a234244dc..9dd00d421 100644 --- a/grub-core/lib/i386/reboot.c +++ b/grub-core/lib/i386/reboot.c @@ -16,6 +16,8 @@ * along with GRUB. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef GRUB_MACHINE_EFI + #include <grub/relocator.h> #include <grub/cpu/relocator.h> #include <grub/misc.h> @@ -58,3 +60,5 @@ grub_reboot (void) while (1); } + +#endif /* ndef GRUB_MACHINE_EFI */ -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel