summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-05 10:50:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-06 15:12:39 +0100
commitd9f2e593172d9d2d5f4c70ff820416c292a976ef (patch)
tree7960d0cf16850127844935c636a58e582a60b92c
parentcac052cdecb4cead10cc301ce83945816110a5e1 (diff)
downloadpoky-d9f2e593172d9d2d5f4c70ff820416c292a976ef.tar.gz
kexec-tools: Fix build with -fno-common
(From OE-Core rev: f389ee22a0f3829624fc4d7ebbd3747e827bcf2e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch43
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb1
2 files changed, 44 insertions, 0 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
new file mode 100644
index 0000000000..355053363e
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch
@@ -0,0 +1,43 @@
1From c5fec6d6368b4103557deb710150119dca438544 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Aug 2020 10:46:39 -0700
4Subject: [PATCH] kexec: Fix build with -fno-common
5
6Ensure that my_debug is not doubly defined
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 kexec/arch/ppc64/kexec-elf-ppc64.c | 2 --
12 kexec/fs2dt.h | 2 +-
13 2 files changed, 1 insertion(+), 3 deletions(-)
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
18+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
19@@ -44,8 +44,6 @@
20 uint64_t initrd_base, initrd_size;
21 unsigned char reuse_initrd = 0;
22 const char *ramdisk;
23-/* Used for enabling printing message from purgatory code */
24-int my_debug = 0;
25
26 int elf_ppc64_probe(const char *buf, off_t len)
27 {
28diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h
29index 7633273..fe24931 100644
30--- a/kexec/fs2dt.h
31+++ b/kexec/fs2dt.h
32@@ -30,7 +30,7 @@ extern struct bootblock bb[1];
33
34 /* Used for enabling printing message from purgatory code
35 * Only has implemented for PPC64 */
36-int my_debug;
37+extern int my_debug;
38 extern int dt_no_old_root;
39
40 void reserve(unsigned long long where, unsigned long long length);
41--
422.28.0
43
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb
index 871b36440f..1e81ecc2c7 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.20.bb
@@ -20,6 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
20 file://0005-Disable-PIE-during-link.patch \ 20 file://0005-Disable-PIE-during-link.patch \
21 file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \ 21 file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \
22 file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \ 22 file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \
23 file://0001-kexec-Fix-build-with-fno-common.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "46724b67f32501c5d3e778161347cad9" 26SRC_URI[md5sum] = "46724b67f32501c5d3e778161347cad9"