From 2223aa05ad84131b8e3a9cafec8aa42b6b8b18c0b226aac6477a9371b3949aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 26 Apr 2021 09:45:32 +0000 Subject: [PATCH] Accepting request 888429 from home:ptesarik:branches:Kernel:kdump - kexec-tools-remove-duplicate-ramdisk-definition.patch: Remove duplicate definition of ramdisk (fix ppc build). OBS-URL: https://build.opensuse.org/request/show/888429 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=137 --- ...-remove-duplicate-ramdisk-definition.patch | 22 +++++++++++++++++++ kexec-tools.changes | 6 +++++ kexec-tools.spec | 1 + 3 files changed, 29 insertions(+) create mode 100644 kexec-tools-remove-duplicate-ramdisk-definition.patch diff --git a/kexec-tools-remove-duplicate-ramdisk-definition.patch b/kexec-tools-remove-duplicate-ramdisk-definition.patch new file mode 100644 index 0000000..e0be72c --- /dev/null +++ b/kexec-tools-remove-duplicate-ramdisk-definition.patch @@ -0,0 +1,22 @@ +From: Petr Tesarik +Subject: Remove duplicate definition of ramdisk +Upstream: not yet, sent on 2021-04-26 + +The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This +other definition is not needed and breaks build with -fno-common. + +Signed-off-by: Petr Tesarik +--- + kexec/arch/ppc/kexec-elf-ppc.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/kexec/arch/ppc/kexec-elf-ppc.c ++++ b/kexec/arch/ppc/kexec-elf-ppc.c +@@ -33,7 +33,6 @@ + static const int probe_debug = 0; + + unsigned char reuse_initrd; +-const char *ramdisk; + int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, + char *); + diff --git a/kexec-tools.changes b/kexec-tools.changes index b66ad58..78b9c8a 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 26 09:35:21 UTC 2021 - Petr Tesařík + +- kexec-tools-remove-duplicate-ramdisk-definition.patch: + Remove duplicate definition of ramdisk (fix ppc build). + ------------------------------------------------------------------- Mon Apr 26 08:07:47 UTC 2021 - Petr Tesařík diff --git a/kexec-tools.spec b/kexec-tools.spec index 21c8137..370b8e3 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -31,6 +31,7 @@ Patch3: %{name}-disable-test.patch Patch4: %{name}-vmcoreinfo-in-xen.patch Patch9: %{name}-video-capability.patch Patch10: %{name}-SYS_getrandom.patch +Patch11: %{name}-remove-duplicate-ramdisk-definition.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: systemd-rpm-macros