summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@xilinx.com>2020-02-21 12:45:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-22 23:57:26 +0000
commita8fa7a3f40e14ab3d8592d8bedf07dfb8e7cb70e (patch)
treef4998661af87afd5e65cec65cf4ff8c6e2c055b3 /meta/recipes-kernel
parent57bab0ecca35a8dd13de8b25e4ee755d71f41250 (diff)
downloadpoky-a8fa7a3f40e14ab3d8592d8bedf07dfb8e7cb70e.tar.gz
devsrc: fix objtool generation for v5.4+
commit 6ec14aa7a58a1c2fb303692f8cb1ff82d9abd10a [objtool: Silence build output] was added to -stable in v5.4.19. This change was meant to ensure that build output was truly silent when required. But the trailing "cd -" in the tools script was ensuring that a success return code was always returned from the sync script. As such, some missing files for x86 were being masked. We add those files to ensure that objtool can be regenerated as required (From OE-Core rev: 3009e82f65bcf0988b4400552afd554ff91f024b) Signed-off-by: Bruce Ashfield <bruce.ashfield@xilinx.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 2fa4be67cc..2888236628 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -200,6 +200,7 @@ do_install() {
200 cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/ 200 cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/
201 cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/ 201 cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/
202 cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/ 202 cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/
203 cp -a --parents arch/x86/tools/gen-insn-attr-x86.awk $kerneldir/build/ 2>/dev/null || :
203 cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/ 204 cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/
204 205
205 # 4.18 + have unified the purgatory files, so we ignore any errors if 206 # 4.18 + have unified the purgatory files, so we ignore any errors if
@@ -215,6 +216,10 @@ do_install() {
215 cp -a --parents arch/x86/boot/string.c $kerneldir/build/ 216 cp -a --parents arch/x86/boot/string.c $kerneldir/build/
216 cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || : 217 cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || :
217 cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/ 218 cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/
219
220 # objtool requires these files
221 cp -a --parents arch/x86/lib/inat.c $kerneldir/build/ 2>/dev/null || :
222 cp -a --parents arch/x86/lib/insn.c $kerneldir/build/ 2>/dev/null || :
218 fi 223 fi
219 224
220 if [ "${ARCH}" = "mips" ]; then 225 if [ "${ARCH}" = "mips" ]; then