summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-08-17 15:27:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-18 16:01:06 (GMT)
commit408a1d24e11e72f8f477cf690f6c7fcc57541805 (patch)
tree683eb91191f2466742a1ce0f121a240182c2ff25
parentf2bf71a3928996a3839220839d472cef64cb8348 (diff)
downloadpoky-408a1d24e11e72f8f477cf690f6c7fcc57541805.tar.gz
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. (From OE-Core rev: 5debc9bc25110b836b76927c61b2455e5e235a84) 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 3b5fdda..23de1a4 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -220,10 +220,10 @@ do_install() {
220 220
221 if [ "${ARCH}" = "x86" ]; then 221 if [ "${ARCH}" = "x86" ]; then
222 # files for 'make prepare' to succeed with kernel-devel 222 # files for 'make prepare' to succeed with kernel-devel
223 cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build/ 223 cp -a --parents $(find arch/x86 -type f -name "syscall_32.tbl") $kerneldir/build/ 2>/dev/null || :
224 cp -a --parents $(find arch/x86 -type f -name "syscalltbl.sh") $kerneldir/build/ 224 cp -a --parents $(find arch/x86 -type f -name "syscalltbl.sh") $kerneldir/build/ 2>/dev/null || :
225 cp -a --parents $(find arch/x86 -type f -name "syscallhdr.sh") $kerneldir/build/ 225 cp -a --parents $(find arch/x86 -type f -name "syscallhdr.sh") $kerneldir/build/ 2>/dev/null || :
226 cp -a --parents $(find arch/x86 -type f -name "syscall_64.tbl") $kerneldir/build/ 226 cp -a --parents $(find arch/x86 -type f -name "syscall_64.tbl") $kerneldir/build/ 2>/dev/null || :
227 cp -a --parents arch/x86/tools/relocs_32.c $kerneldir/build/ 227 cp -a --parents arch/x86/tools/relocs_32.c $kerneldir/build/
228 cp -a --parents arch/x86/tools/relocs_64.c $kerneldir/build/ 228 cp -a --parents arch/x86/tools/relocs_64.c $kerneldir/build/
229 cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/ 229 cp -a --parents arch/x86/tools/relocs.c $kerneldir/build/