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

kexec-tools-remove-duplicate-ramdisk-definition.patch

@@ -0,0 +1,22 @@
+From: Petr Tesarik <ptesarik@suse.com>
+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 <ptesarik@suse.com>
+---
+ 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 *);
+ 

kexec-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 26 09:35:21 UTC 2021 - Petr Tesařík <ptesarik@suse.com>
+
+- 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 <ptesarik@suse.com>
 

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