Accepting request 634766 from home:aplanas:branches:Kernel:kdump

- kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
  Upstream backport.
  In response to a change in binutils, commit b21ebf2fb4c
  (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
  the linux kernel during the 4.16 development cycle and has
  since been backported to earlier stable kernel series. The
  change results in the failure message in $SUBJECT when
  rebooting via kexec.
  Fix this by replicating the change in kexec.

OBS-URL: https://build.opensuse.org/request/show/634766
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=103

kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch

@@ -0,0 +1,36 @@
+From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001
+From: Chris Clayton <chris2553@googlemail.com>
+Date: Mon, 20 Aug 2018 12:00:31 +0100
+Subject: [PATCH] kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32"
+ error
+
+In response to a change in binutils, commit b21ebf2fb4c
+(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
+the linux kernel during the 4.16 development cycle and has
+since been backported to earlier stable kernel series. The
+change results in the failure message in $SUBJECT when
+rebooting via kexec.
+
+Fix this by replicating the change in kexec.
+
+Signed-off-by: Chris Clayton <chris2553@googlemail.com>
+Acked-by: Baoquan He <bhe@redhat.com>
+Tested-by: Bhupesh Sharma <bhsharma@redhat.com>
+Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
+Signed-off-by: Simon Horman <horms@verge.net.au>
+---
+ kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+index 7fdde73..db85b44 100644
+--- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
++++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c
+@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),
+ 			goto overflow;
+ 		break;
+ 	case R_X86_64_PC32: 
++	case R_X86_64_PLT32:
+ 		*(uint32_t *)location = value - address;
+ 		break;
+ 	default:

kexec-tools.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Sep 10 14:27:09 UTC 2018 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- kexec-tools-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
+  Upstream backport.
+
+  In response to a change in binutils, commit b21ebf2fb4c
+  (x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to
+  the linux kernel during the 4.16 development cycle and has
+  since been backported to earlier stable kernel series. The
+  change results in the failure message in $SUBJECT when
+  rebooting via kexec.
+
+  Fix this by replicating the change in kexec. 
+
 -------------------------------------------------------------------
 Thu Apr 19 11:54:10 UTC 2018 - ptesarik@suse.com
 

kexec-tools.spec

@@ -20,7 +20,7 @@ Name:           kexec-tools
 Version:        2.0.17
 Release:        0
 Summary:        Tools for loading replacement kernels into memory
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Kernel
 Url:            https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source:         https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/snapshot/%{name}-%{version}.tar.xz
@@ -31,6 +31,7 @@ Source4:        %{name}-rpmlintrc
 Patch2:         %{name}-xen-balloon-up.patch
 Patch3:         %{name}-disable-test.patch
 Patch14:        %{name}-vmcoreinfo-in-xen.patch
+Patch15:        %{name}-fix-for-Unhandled-rela-relocation-R_X86_64_PLT32.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
@@ -57,6 +58,7 @@ the loaded kernel after it panics.
 %patch2 -p1
 %patch3 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 autoreconf -fvi