summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-05-18 19:13:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:14 +0100
commit6dbac6e225bb8579c6098981ed57de6001cd4d14 (patch)
treea9389bbf391ddc61689f8bcbdfcad71aea20a464
parent1f9bb6c96a24062be7e9d01abbd391f68a3cc39e (diff)
downloadpoky-6dbac6e225bb8579c6098981ed57de6001cd4d14.tar.gz
kexec-tools: upgrade 2.0.16 -> 2.0.17
(From OE-Core rev: 8da23d49367f48a195b952b5c2e2f7ce2221a572) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch33
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb (renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb)9
2 files changed, 3 insertions, 39 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch
deleted file mode 100644
index 786fc0ce41..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From a12dfe9be05f9dee96c7637a20c01e05711c563c Mon Sep 17 00:00:00 2001
2From: David Michael <david.michael@coreos.com>
3Date: Sun, 7 Jan 11:26:57 2018 -0500
4Subject: [PATCH] arm64: Set -fno-PIC along with -mcmodel=large
5
6As seen in GCC's gcc/config/aarch64/aarch64.c, -fPIC with large
7code model is unsupported. This fixes the "sorry, unimplemented"
8errors when building with compilers defaulting to -fPIC.
9
10Upstream-Status: Backport
11
12Signed-off-by: Simon Horman <horms@verge.net.au>
13Signed-off-by: David Michael <david.michael@coreos.com>
14Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
15---
16 purgatory/arch/arm64/Makefile | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile
20index 636abea..80068ca 100644
21--- a/purgatory/arch/arm64/Makefile
22+++ b/purgatory/arch/arm64/Makefile
23@@ -1,6 +1,7 @@
24
25 arm64_PURGATORY_EXTRA_CFLAGS = \
26 -mcmodel=large \
27+ -fno-PIC \
28 -fno-stack-protector \
29 -fno-asynchronous-unwind-tables \
30 -Wundef \
31--
322.7.4
33
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb
index bd87b371c2..f4ec5865e3 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.17.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
9 file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" 9 file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
10DEPENDS = "zlib xz" 10DEPENDS = "zlib xz"
11 11
12PR = "r1"
13
14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ 12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
15 file://kdump \ 13 file://kdump \
16 file://kdump.conf \ 14 file://kdump.conf \
@@ -20,11 +18,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
20 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ 18 file://0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
21 file://kexec-x32.patch \ 19 file://kexec-x32.patch \
22 file://0001-Disable-PIE-during-link.patch \ 20 file://0001-Disable-PIE-during-link.patch \
23 file://0001-arm64-Set-fno-PIC-along-with-mcmodel-large.patch \ 21 "
24 "
25 22
26SRC_URI[md5sum] = "5198968de79b5ded96f97f3c2ea9637b" 23SRC_URI[md5sum] = "8e071ca473694a71e4ae60ed7ef6f377"
27SRC_URI[sha256sum] = "cf17fc99bf77c9b39f06ee88ac0e86d0349c4a0c3f8214a3cc78eece872f6f3a" 24SRC_URI[sha256sum] = "450c87ba048641eb05f9717f5567aca57f063c266149ae663b58a34e5852deaf"
28 25
29inherit autotools update-rc.d systemd 26inherit autotools update-rc.d systemd
30 27