Re: [OE-core] [PATCH 1/3] kernel-devsrc: Add needed fixes for 6.1+ kernel build on target on RISCV

Richard Purdie
2024-02-08T23:14:38Z

On Tue, 2024-02-06 at 18:26 -0500, Bruce Ashfield wrote:
> On Tue, Feb 6, 2024 at 1:49 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > meta/recipes-kernel/linux/kernel-devsrc.bb | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> > index 9c3c09e7144..07a20feb8ef 100644
> > --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> > +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> > @@ -224,10 +224,16 @@ 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/
> > + # v6.1+
> > + cp -a --parents arch/riscv/kernel/asm-offsets.c $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 || :
> > + cp -a --parents arch/riscv/kernel/vdso/* $kerneldir/build/ 2>/dev/null || :
>
> I'm just off a flight and running on very little sleep, but I can't
> tell what changed in the line
> above here. Is it whitespace ?
>
> > + if [ -e arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh ]; then
> > + cp -a --parents arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh $kerneldir/build/
> > + fi
>
> I realize I have a mix of conditionals and ||: in the file, but we've
> been doing most of
> the new additions without conditionals. Would the
> gen_compat_vdso_offsets.sh copy
> work in that style ?
>
> i.e. cp -a --parents
> arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh
> $kerneldir/build/2>/dev/null || :

I ended up heavily cleaning up the whitespace in this file and this
patch.

If anyone wants to make the conditionals more consistent I'm fine with
that too, I tend to prefer the if blocks but you can argue it both
ways, as ever...

Cheers,

Richard