diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-kernel/kexec | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-kernel/kexec')
-rw-r--r-- | poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch | 41 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service | 3 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb (renamed from poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb) | 12 |
3 files changed, 50 insertions, 6 deletions
diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch new file mode 100644 index 0000000000..e0cced55c1 --- /dev/null +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch @@ -0,0 +1,41 @@ +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. + +Upstream-Status: Backport[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=b9de21ef51a7ceab7122a707c188602eae22c4ee] + +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> +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + 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/poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service b/poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service index 013c5a62b3..b4a2c0611d 100644 --- a/poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service @@ -1,7 +1,8 @@ [Unit] Description=Reboot and dump vmcore via kexec DefaultDependencies=no -After=basic.target +Requires=sysinit.target +After=sysinit.target [Service] Type=oneshot diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb index ebb4832684..4b9b5accb6 100644 --- a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb +++ b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb @@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" DEPENDS = "zlib xz" -PR = "r1" - SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ file://kdump \ file://kdump.conf \ @@ -20,10 +18,11 @@ 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] = "5198968de79b5ded96f97f3c2ea9637b" -SRC_URI[sha256sum] = "cf17fc99bf77c9b39f06ee88ac0e86d0349c4a0c3f8214a3cc78eece872f6f3a" +SRC_URI[md5sum] = "8e071ca473694a71e4ae60ed7ef6f377" +SRC_URI[sha256sum] = "450c87ba048641eb05f9717f5567aca57f063c266149ae663b58a34e5852deaf" inherit autotools update-rc.d systemd @@ -79,6 +78,9 @@ INITSCRIPT_PACKAGES = "kdump" INITSCRIPT_NAME_kdump = "kdump" INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ." +SYSTEMD_PACKAGES = "kdump" +SYSTEMD_SERVICE_kdump = "kdump.service" + SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' |