68 lines
1.7 KiB
Diff
68 lines
1.7 KiB
Diff
From 26e5aea9418aab83df0debd0c672086fa9f2d9c8 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Mon, 14 Aug 2017 14:09:30 +0200
|
|
Subject: [PATCH 067/225] Fix symbols appearing in several modules in linux*.
|
|
|
|
If same symbol is provided by 2 modules its semantics are undefined.
|
|
Avoid this by depending rather than double-including files.
|
|
---
|
|
grub-core/Makefile.core.def | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index 8d57a59a0..66144222c 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -770,6 +770,7 @@ module = {
|
|
module = {
|
|
name = boot;
|
|
common = commands/boot.c;
|
|
+ common = lib/cmdline.c;
|
|
i386_pc = lib/i386/pc/biosnum.c;
|
|
enable = x86;
|
|
enable = emu;
|
|
@@ -1630,8 +1631,6 @@ module = {
|
|
module = {
|
|
name = linux16;
|
|
common = loader/i386/pc/linux.c;
|
|
- common = loader/linux.c;
|
|
- common = lib/cmdline.c;
|
|
enable = x86;
|
|
};
|
|
|
|
@@ -1666,7 +1665,6 @@ module = {
|
|
cppflags = "-DGRUB_USE_MULTIBOOT2";
|
|
|
|
common = loader/multiboot.c;
|
|
- common = lib/cmdline.c;
|
|
common = loader/multiboot_mbi2.c;
|
|
enable = x86;
|
|
enable = mips;
|
|
@@ -1675,7 +1673,6 @@ module = {
|
|
module = {
|
|
name = multiboot;
|
|
common = loader/multiboot.c;
|
|
- common = lib/cmdline.c;
|
|
x86 = loader/i386/multiboot_mbi.c;
|
|
extra_dist = loader/multiboot_elfxx.c;
|
|
enable = x86;
|
|
@@ -1683,7 +1680,6 @@ module = {
|
|
|
|
module = {
|
|
name = xen_boot;
|
|
- common = lib/cmdline.c;
|
|
arm64 = loader/arm64/xen_boot.c;
|
|
enable = arm64;
|
|
};
|
|
@@ -1700,7 +1696,6 @@ module = {
|
|
arm = loader/arm/linux.c;
|
|
arm64 = loader/arm64/linux.c;
|
|
common = loader/linux.c;
|
|
- common = lib/cmdline.c;
|
|
enable = noemu;
|
|
};
|
|
|
|
--
|
|
2.14.3
|
|
|