From 32276b968ece37b4d66195c470d78aed7896d5c6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 11 Apr 2022 09:59:02 -0700 Subject: [PATCH] kernel-devsrc: Check for gen_vdso_offsets.sh before copying on riscv This file is introduced in newer kernels >= 5.15 but some RISCV machines still use 5.13 kernels, this ensures that kernel-devsrc can build on older kernels for RISCV (From OE-Core rev: b4d3c2c03495730a2253669ad8a438288629a1c8) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 8d360ed3f3..9654488a54 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -112,7 +112,9 @@ do_install() { fi if [ "${ARCH}" = "arm64" -o "${ARCH}" = "riscv" ]; then - cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/ + if [ -e arch/${ARCH}/kernel/vdso/vdso.lds ]; then + cp -a --parents arch/${ARCH}/kernel/vdso/vdso.lds $kerneldir/build/ + fi fi if [ "${ARCH}" = "powerpc" ]; then cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || : @@ -190,7 +192,9 @@ do_install() { if [ "${ARCH}" = "riscv" ]; then cp -a --parents arch/riscv/kernel/vdso/*gettimeofday.* $kerneldir/build/ cp -a --parents arch/riscv/kernel/vdso/note.S $kerneldir/build/ - cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ + if [ -e arch/riscv/kernel/vdso/gen_vdso_offsets.sh ]; then + cp -a --parents arch/riscv/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ + fi cp -a --parents arch/riscv/kernel/vdso/* $kerneldir/build/ 2>/dev/null || : fi