summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.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-tiny_4.19.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-tiny_4.19.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index 1220a05d5f..e2626ab4c9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "6e7574e9a9b41143e0c42fcb31b13802529602f0" 18SRCREV_machine_qemuarm ?= "bd239fb802a15c2759ea456dd1f09f5e106fc88a"
19SRCREV_machine ?= "2ba1fa4d5068982e785527ef8ad1a8b658f0add1" 19SRCREV_machine ?= "b44ad1b1e7c685e75b7788a026a2416edc2ee656"
20SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a" 20SRCREV_meta ?= "4f5d761316a9cf14605e5d0cc91b53c1b2e9dc6a"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"