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

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>

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 2fa4be67cc99ec18df84ea6697687a55a3f14a76..2888236628cdd0faa0a89610f15f5c1248f851d9 100644 (file)
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -200,6 +200,7 @@ do_install() {
            cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/
            cp -a --parents arch/x86/tools/relocs_common.c $kerneldir/build/
            cp -a --parents arch/x86/tools/relocs.h $kerneldir/build/
+           cp -a --parents arch/x86/tools/gen-insn-attr-x86.awk $kerneldir/build/ 2>/dev/null || :
            cp -a --parents arch/x86/purgatory/purgatory.c $kerneldir/build/
 
            # 4.18 + have unified the purgatory files, so we ignore any errors if
@@ -215,6 +216,10 @@ do_install() {
            cp -a --parents arch/x86/boot/string.c $kerneldir/build/
            cp -a --parents arch/x86/boot/compressed/string.c $kerneldir/build/ 2>/dev/null || :
            cp -a --parents arch/x86/boot/ctype.h $kerneldir/build/
+
+           # objtool requires these files
+           cp -a --parents arch/x86/lib/inat.c $kerneldir/build/ 2>/dev/null || :
+           cp -a --parents arch/x86/lib/insn.c $kerneldir/build/ 2>/dev/null || :
        fi
 
        if [ "${ARCH}" = "mips" ]; then