diff -Nru kexec-tools-2.0.16/debian/changelog kexec-tools-2.0.16/debian/changelog --- kexec-tools-2.0.16/debian/changelog 2018-08-30 09:40:55.000000000 -0300 +++ kexec-tools-2.0.16/debian/changelog 2018-09-10 16:46:00.000000000 -0300 @@ -1,3 +1,9 @@ +kexec-tools (1:2.0.16-1ubuntu3) cosmic; urgency=medium + + * Fix for "Unhandled rela relocation: R_X86_64_PLT32" error. LP: #1791804 + + -- Thadeu Lima de Souza Cascardo Mon, 10 Sep 2018 16:46:00 -0300 + kexec-tools (1:2.0.16-1ubuntu2) cosmic; urgency=medium * Add support for kexec_file_load on s390x. LP: #1783086 diff -Nru kexec-tools-2.0.16/debian/patches/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch kexec-tools-2.0.16/debian/patches/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch --- kexec-tools-2.0.16/debian/patches/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch 1969-12-31 21:00:00.000000000 -0300 +++ kexec-tools-2.0.16/debian/patches/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch 2018-09-10 16:44:59.000000000 -0300 @@ -0,0 +1,39 @@ +From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001 +From: Chris Clayton +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 +Acked-by: Baoquan He +Tested-by: Bhupesh Sharma +Acked-by: Bhupesh Sharma +Signed-off-by: Simon Horman +--- + 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 7fdde73a5eca..db85b443238d 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: +-- +2.17.1 + diff -Nru kexec-tools-2.0.16/debian/patches/series kexec-tools-2.0.16/debian/patches/series --- kexec-tools-2.0.16/debian/patches/series 2018-08-30 09:40:46.000000000 -0300 +++ kexec-tools-2.0.16/debian/patches/series 2018-09-10 16:45:39.000000000 -0300 @@ -7,3 +7,4 @@ powerpcspe_support.patch arm64_build.patch 0001-kexec-s390-Add-support-for-kexec_file_load.patch +0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch