summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kexec
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-15 23:42:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-18 11:44:55 +0100
commit2d54561f7462dba931902f0f959ff50de3430950 (patch)
tree1a8cdd4b0b360f86ba9ee0fe41fe3599b929c77e /meta/recipes-kernel/kexec
parent7e25a6b4d52a16e812dfd444d65283d2c75d2d77 (diff)
downloadpoky-2d54561f7462dba931902f0f959ff50de3430950.tar.gz
kexec-tools: Fix additional duplicate symbols on aarch64/x86_64 builds
Fixes build with -fno-common (From OE-Core rev: 984740bfd8b655a95065f628a89459ac06086b42) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kexec')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch39
1 files changed, 32 insertions, 7 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch
index 355053363e..a3ba0912d4 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch
@@ -12,8 +12,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 kexec/fs2dt.h | 2 +- 12 kexec/fs2dt.h | 2 +-
13 2 files changed, 1 insertion(+), 3 deletions(-) 13 2 files changed, 1 insertion(+), 3 deletions(-)
14 14
15diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c
16index 3510b70..695b8b0 100644
17--- a/kexec/arch/ppc64/kexec-elf-ppc64.c 15--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
18+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c 16+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
19@@ -44,8 +44,6 @@ 17@@ -44,8 +44,6 @@
@@ -25,8 +23,6 @@ index 3510b70..695b8b0 100644
25 23
26 int elf_ppc64_probe(const char *buf, off_t len) 24 int elf_ppc64_probe(const char *buf, off_t len)
27 { 25 {
28diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h
29index 7633273..fe24931 100644
30--- a/kexec/fs2dt.h 26--- a/kexec/fs2dt.h
31+++ b/kexec/fs2dt.h 27+++ b/kexec/fs2dt.h
32@@ -30,7 +30,7 @@ extern struct bootblock bb[1]; 28@@ -30,7 +30,7 @@ extern struct bootblock bb[1];
@@ -38,6 +34,35 @@ index 7633273..fe24931 100644
38 extern int dt_no_old_root; 34 extern int dt_no_old_root;
39 35
40 void reserve(unsigned long long where, unsigned long long length); 36 void reserve(unsigned long long where, unsigned long long length);
41-- 37--- a/kexec/arch/arm64/kexec-arm64.h
422.28.0 38+++ b/kexec/arch/arm64/kexec-arm64.h
43 39@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **a
40 void zImage_arm64_usage(void);
41
42
43-off_t initrd_base;
44-off_t initrd_size;
45+extern off_t initrd_base;
46+extern off_t initrd_size;
47
48 /**
49 * struct arm64_mem - Memory layout info.
50@@ -65,7 +65,7 @@ struct arm64_mem {
51 };
52
53 #define arm64_mem_ngv UINT64_MAX
54-struct arm64_mem arm64_mem;
55+extern struct arm64_mem arm64_mem;
56
57 uint64_t get_phys_offset(void);
58 uint64_t get_vp_offset(void);
59--- a/kexec/arch/x86_64/kexec-bzImage64.c
60+++ b/kexec/arch/x86_64/kexec-bzImage64.c
61@@ -42,7 +42,6 @@
62 #include <arch/options.h>
63
64 static const int probe_debug = 0;
65-int bzImage_support_efi_boot;
66
67 int bzImage64_probe(const char *buf, off_t len)
68 {