aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-08-17 11:27:31 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-18 17:00:16 +0100
commit5debc9bc25110b836b76927c61b2455e5e235a84 (patch)
treed2a3810fafbcd75ba6bede7a33e0c14798fe4d57
parent5dad15af8b3423ad9631edf3eef6e77902f1b36e (diff)
downloadopenembedded-core-contrib-5debc9bc25110b836b76927c61b2455e5e235a84.tar.gz
openembedded-core-contrib-5debc9bc25110b836b76927c61b2455e5e235a84.tar.bz2
openembedded-core-contrib-5debc9bc25110b836b76927c61b2455e5e235a84.zip
kernel-devsrc: 5.14+ updates
commit 6218d0f6b8dec [x86/syscalls: Switch to generic syscalltbl.sh] means that x86 no longer has a syscall script to copy, which causes a build error. We already copy the generic syscall script (in scripts), so we just catch errors for the copies to support older and 5.14+ kernels in the same devsrc recipe. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 3b5fdda7734..23de1a49177 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -220,10 +220,10 @@ do_install() {
if [ "${ARCH}" = "x86" ]; then
# files for 'make prepare' to succeed with kernel-devel
- cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build/
- cp -a --parents $(find arch/x86 -type f -name "syscalltbl.sh") $kerneldir/build/
- cp -a --parents $(find arch/x86 -type f -name "syscallhdr.sh") $kerneldir/build/
- cp -a --parents $(find arch/x86 -type f -name "syscall_64.tbl") $kerneldir/build/
+ cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build/ 2>/dev/null || :
+ cp -a --parents $(find arch/x86 -type f -name "syscalltbl.sh") $kerneldir/build/ 2>/dev/null || :
+ cp -a --parents $(find arch/x86 -type f -name "syscallhdr.sh") $kerneldir/build/ 2>/dev/null || :
+ cp -a --parents $(find arch/x86 -type f -name "syscall_64.tbl") $kerneldir/build/ 2>/dev/null || :
cp -a --parents arch/x86/tools/relocs_32.c $kerneldir/build/
cp -a --parents arch/x86/tools/relocs_64.c $kerneldir/build/
cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/