]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel-devsrc: restore compatibility with kernel < v4.10
authorS. Lockwood-Childs <sjl@vctlabs.com>
Tue, 5 Feb 2019 00:39:01 +0000 (16:39 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 6 Feb 2019 08:29:02 +0000 (08:29 +0000)
The kernel commit that added the syscall table generation tools
for ARM platform (ARM: convert to generated system call tables)
wasn't merged until kernel release v4.10.

Current assumption in kernel-devsrc recipe is that these syscall
scripts exist, which breaks the build for external board layers that are
still using 4.9.x kernels:

  cp: cannot stat ‘arch/arm/tools/syscall*’: No such file or directory

so only try to install the scripts when they actually exist.

Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-kernel/linux/kernel-devsrc.bb

index 87347fa9691ee84b5465747ad140163bc127ad89..8fc0ffdbb343a59cb1187285371553648d352c2e 100644 (file)
@@ -157,7 +157,12 @@ do_install() {
            # include a few files for 'make prepare'
            cp -a --parents arch/arm/tools/gen-mach-types $kerneldir/build/
            cp -a --parents arch/arm/tools/mach-types $kerneldir/build/
-           cp -a --parents arch/arm/tools/syscall* $kerneldir/build/
+
+           # ARM syscall table tools only exist for kernels v4.10 or later
+            SYSCALL_TOOLS=$(find arch/arm/tools -name "syscall*")
+            if [ -n "$SYSCALL_TOOLS" ] ; then
+               cp -a --parents $SYSCALL_TOOLS $kerneldir/build/
+            fi
 
             cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/
        fi