From 7b4d77d7f909c0ae27553fd9c480f069f12e468f Mon Sep 17 00:00:00 2001 From: "S. Lockwood-Childs" Date: Mon, 4 Feb 2019 16:39:01 -0800 Subject: kernel-devsrc: restore compatibility with kernel < v4.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-kernel/linux/kernel-devsrc.bb') diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 87347fa969..8fc0ffdbb3 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -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 -- cgit 1.2.3-korg