diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-12-29 22:07:19 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-01-08 20:29:28 -0800 |
| commit | 201965ba510830561a8c1c38f7c111207f604d03 (patch) | |
| tree | bf73736f9c0f800eeb1003c04d0b36a973f4a650 /meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | |
| parent | 761a6ddf2555535e8edc4b52091dd5047f8a7af7 (diff) | |
| download | openembedded-core-contrib-201965ba510830561a8c1c38f7c111207f604d03.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>
]
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>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index 6dc2f8078c..673208e4c3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "817c65ec880afb367c6f1d67f524b94ee9c3ae6a" +SRCREV_machine ?= "b31e1489cfd0f383e662b5599beb83dfe24507bc" SRCREV_meta ?= "af93d12baae0ddac3d4c3a1e1a8f8e72da8c395a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |