From: Bruce Ashfield <bruce.ashfi...@gmail.com>

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.ashfi...@gmail.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
(cherry picked from commit 5debc9bc25110b836b76927c61b2455e5e235a84)
Signed-off-by: Anuj Mittal <anuj.mit...@intel.com>
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb 
b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 92076ac8b0..4897084aab 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -218,10 +218,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/
-- 
2.31.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155248): 
https://lists.openembedded.org/g/openembedded-core/message/155248
Mute This Topic: https://lists.openembedded.org/mt/85114713/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to