Drop patch included 0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch
Signed-off-by: Armin Kuster <[email protected]> --- ...or-Unhandled-rela-relocation-R_X86_64_PLT.patch | 41 ---------------------- ...kexec-tools_2.0.17.bb => kexec-tools_2.0.18.bb} | 5 ++- 2 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch rename meta/recipes-kernel/kexec/{kexec-tools_2.0.17.bb => kexec-tools_2.0.18.bb} (93%) diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch deleted file mode 100644 index e0cced5..0000000 --- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001 -From: Chris Clayton <[email protected]> -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. - -Upstream-Status: Backport[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=b9de21ef51a7ceab7122a707c188602eae22c4ee] - -Signed-off-by: Chris Clayton <[email protected]> -Acked-by: Baoquan He <[email protected]> -Tested-by: Bhupesh Sharma <[email protected]> -Acked-by: Bhupesh Sharma <[email protected]> -Signed-off-by: Simon Horman <[email protected]> -Signed-off-by: Mingli Yu <[email protected]> ---- - 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: --- -2.7.4 - diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.18.bb similarity index 93% rename from meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb rename to meta/recipes-kernel/kexec/kexec-tools_2.0.18.bb index 4b9b5ac..b06c343 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.18.bb @@ -18,11 +18,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ file://kexec-x32.patch \ file://0001-Disable-PIE-during-link.patch \ - file://0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch \ " -SRC_URI[md5sum] = "8e071ca473694a71e4ae60ed7ef6f377" -SRC_URI[sha256sum] = "450c87ba048641eb05f9717f5567aca57f063c266149ae663b58a34e5852deaf" +SRC_URI[md5sum] = "43845327af54b002aaebd5b8076c7bd7" +SRC_URI[sha256sum] = "594ac13ea437c70b0d5f0eaf5075b93422b05c23c2a5e21991d2442bbd202d86" inherit autotools update-rc.d systemd -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
