summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorS. Lockwood-Childs <sjl@vctlabs.com>2019-02-04 16:39:01 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-06 08:29:06 +0000
commitd5abdf023bbdd32cb2a35cb40e828127dd50ea3a (patch)
tree9e5256df0680b63e1198c9bf69554851cd5dea6b /meta
parent362aa431d853cec7c9397e71d4d59aa7edf19314 (diff)
downloadpoky-d5abdf023bbdd32cb2a35cb40e828127dd50ea3a.tar.gz
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. (From OE-Core rev: 7b4d77d7f909c0ae27553fd9c480f069f12e468f) Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb7
1 files changed, 6 insertions, 1 deletions
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() {
157 # include a few files for 'make prepare' 157 # include a few files for 'make prepare'
158 cp -a --parents arch/arm/tools/gen-mach-types $kerneldir/build/ 158 cp -a --parents arch/arm/tools/gen-mach-types $kerneldir/build/
159 cp -a --parents arch/arm/tools/mach-types $kerneldir/build/ 159 cp -a --parents arch/arm/tools/mach-types $kerneldir/build/
160 cp -a --parents arch/arm/tools/syscall* $kerneldir/build/ 160
161 # ARM syscall table tools only exist for kernels v4.10 or later
162 SYSCALL_TOOLS=$(find arch/arm/tools -name "syscall*")
163 if [ -n "$SYSCALL_TOOLS" ] ; then
164 cp -a --parents $SYSCALL_TOOLS $kerneldir/build/
165 fi
161 166
162 cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/ 167 cp -a --parents arch/arm/kernel/module.lds $kerneldir/build/
163 fi 168 fi