Skip to contentSkip to conversation

kernel-devsrc: restore compatibility with kernel < v4.10

PATCH New S. Lockwood-Childs 1 participant 1 message Feb 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-devsrc: restore compatibility with kernel < v4.10

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.

---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-kernel/linux/kernel-devsrc.bb +6 -1
index 361ad21..5822019 100644
@@ -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
Signature · 1 line
1.9.4