summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_5.2.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-12-29 22:07:19 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-11 11:06:21 +0000
commit9c5e784874ce028bc1999116327bbf9b614acaf5 (patch)
treebeb929bdc724c4a4d571a689509d132f01bdb652 /meta/recipes-kernel/linux/linux-yocto_5.2.bb
parent888526098aa84d6f3e46217b774d29d97d4e9444 (diff)
downloadpoky-9c5e784874ce028bc1999116327bbf9b614acaf5.tar.gz
linux-yocto/4.19/5.2/-dev: fix gcc10 build
Integrating Khem's gcc10 build fix: [ Author: Khem Raj <raj.khem@gmail.com> Date: Fri Dec 20 17:42:02 2019 -0800 x86/boot/compressed/64: Define __force_order only when CONFIG_RANDOMIZE_BASE is unset kaslr_64.c also defines the same variable, however when both files are included into final link, linker complains about multiple definition of `__force_order' which is coming from kaslr_64.o and pgtable_64.o, its possible that kaslr_64.o is disabled via CONFIG_RANDOMIZE_BASE config option, therefore define it conditionally only when CONFIG_RANDOMIZE_BASE is not set Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Kees Cook <keescook@chromium.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: 201965ba510830561a8c1c38f7c111207f604d03) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d3112fcf7283b9c015e77db1b0a1a78044ed2e23) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_5.2.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.2.bb18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb
index 16b6705f88..bc859519cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb
@@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.2/standard/base"
12KBRANCH_qemux86-64 ?= "v5.2/standard/base" 12KBRANCH_qemux86-64 ?= "v5.2/standard/base"
13KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" 13KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64"
14 14
15SRCREV_machine_qemuarm ?= "78b937b0d5d9852a9620d532bb61c8399fc423b4" 15SRCREV_machine_qemuarm ?= "c0864234924e6b1fb2b5bcf817c88fab1c237d7b"
16SRCREV_machine_qemuarm64 ?= "4a765671adc689f3699cd60f58b2851403d0a880" 16SRCREV_machine_qemuarm64 ?= "7107e4a83fb9c9e3b5c3d79222f6e0885e99db13"
17SRCREV_machine_qemumips ?= "0e8e4a3475849ac390213833980411f19b148841" 17SRCREV_machine_qemumips ?= "534d14808c2948d6e3464735f5dcc203cb4be7f7"
18SRCREV_machine_qemuppc ?= "4a765671adc689f3699cd60f58b2851403d0a880" 18SRCREV_machine_qemuppc ?= "7107e4a83fb9c9e3b5c3d79222f6e0885e99db13"
19SRCREV_machine_qemuriscv64 ?= "4a765671adc689f3699cd60f58b2851403d0a880" 19SRCREV_machine_qemuriscv64 ?= "7107e4a83fb9c9e3b5c3d79222f6e0885e99db13"
20SRCREV_machine_qemux86 ?= "4a765671adc689f3699cd60f58b2851403d0a880" 20SRCREV_machine_qemux86 ?= "7107e4a83fb9c9e3b5c3d79222f6e0885e99db13"
21SRCREV_machine_qemux86-64 ?= "4a765671adc689f3699cd60f58b2851403d0a880" 21SRCREV_machine_qemux86-64 ?= "7107e4a83fb9c9e3b5c3d79222f6e0885e99db13"
22SRCREV_machine_qemumips64 ?= "5236aae3076bc8edc7a70b928190ae07512e2425" 22SRCREV_machine_qemumips64 ?= "d052f8cffc2a4ce18def4d9ee66e3c2e4f822150"
23SRCREV_machine ?= "4a765671adc689f3699cd60f58b2851403d0a880" 23SRCREV_machine ?= "7107e4a83fb9c9e3b5c3d79222f6e0885e99db13"
24SRCREV_meta ?= "af93d12baae0ddac3d4c3a1e1a8f8e72da8c395a" 24SRCREV_meta ?= "af93d12baae0ddac3d4c3a1e1a8f8e72da8c395a"
25 25
26# remap qemuarm to qemuarma15 for the 5.2 kernel 26# remap qemuarm to qemuarma15 for the 5.2 kernel