[PATCH] kernel-devsrc: Improve vdso-offsets handling

[PATCH] kernel-devsrc: Improve vdso-offsets handling

[Richard Purdie]

Fix:

kernel-devsrc-1.0-r0 do_package_qa: QA Issue: File /lib/modules/6.6.15-yocto-standard/build/include/generated/.compat_vdso-offsets.h.cmd in package kernel-devsrc contains reference to TMPDIR [buildpaths]

by adding to the list of files we do this with. Also drop the
conditional since rm -f handles this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 55cac1fc817..fafab475f3f 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -130,13 +130,10 @@ do_install() {
         # breaks workflows.
         cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || :
 
-        if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ] ||
-             [ -e $kerneldir/build/include/generated/.vdso-offsets.h.cmd ] ||
-             [ -e $kerneldir/build/include/generated/.vdso32-offsets.h.cmd ] ; then
-            rm -f $kerneldir/include/generated/.vdso-offsets.h.cmd
-            rm -f $kerneldir/build/include/generated/.vdso-offsets.h.cmd
-            rm -f $kerneldir/build/include/generated/.vdso32-offsets.h.cmd
-        fi
+        rm -f $kerneldir/include/generated/.vdso-offsets.h.cmd
+        rm -f $kerneldir/build/include/generated/.vdso-offsets.h.cmd
+        rm -f $kerneldir/build/include/generated/.compat_vdso-offsets.h.cmd
+        rm -f $kerneldir/build/include/generated/.vdso32-offsets.h.cmd
     )
 
     # now grab the chunks from the source tree that we need
-- 
2.40.1

Re: [OE-core] [PATCH] kernel-devsrc: Improve vdso-offsets handling

[Bruce Ashfield]

On Fri, Feb 16, 2024 at 8:12 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Fix:
>
> kernel-devsrc-1.0-r0 do_package_qa: QA Issue: File /lib/modules/6.6.15-yocto-standard/build/include/generated/.compat_vdso-offsets.h.cmd in package kernel-devsrc contains reference to TMPDIR [buildpaths]
>

Did this just start happening ? I test this with all my kernel
releases and I've never seen it.

So it would be good to put in the commit log what caused it to start.

Bruce

> by adding to the list of files we do this with. Also drop the
> conditional since rm -f handles this.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-kernel/linux/kernel-devsrc.bb | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> index 55cac1fc817..fafab475f3f 100644
> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> @@ -130,13 +130,10 @@ do_install() {
>          # breaks workflows.
>          cp -a --parents include/generated/autoconf.h $kerneldir/build 2>/dev/null || :
>
> -        if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ] ||
> -             [ -e $kerneldir/build/include/generated/.vdso-offsets.h.cmd ] ||
> -             [ -e $kerneldir/build/include/generated/.vdso32-offsets.h.cmd ] ; then
> -            rm -f $kerneldir/include/generated/.vdso-offsets.h.cmd
> -            rm -f $kerneldir/build/include/generated/.vdso-offsets.h.cmd
> -            rm -f $kerneldir/build/include/generated/.vdso32-offsets.h.cmd
> -        fi
> +        rm -f $kerneldir/include/generated/.vdso-offsets.h.cmd
> +        rm -f $kerneldir/build/include/generated/.vdso-offsets.h.cmd
> +        rm -f $kerneldir/build/include/generated/.compat_vdso-offsets.h.cmd
> +        rm -f $kerneldir/build/include/generated/.vdso32-offsets.h.cmd
>      )
>
>      # now grab the chunks from the source tree that we need
> --
> 2.40.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#195764): https://lists.openembedded.org/g/openembedded-core/message/195764
> Mute This Topic: https://lists.openembedded.org/mt/104391979/1050810
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [OE-core] [PATCH] kernel-devsrc: Improve vdso-offsets handling

[Richard Purdie]

On Fri, 2024-02-16 at 08:49 -0500, Bruce Ashfield wrote:
> On Fri, Feb 16, 2024 at 8:12 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > Fix:
> > 
> > kernel-devsrc-1.0-r0 do_package_qa: QA Issue: File
> > /lib/modules/6.6.15-yocto-
> > standard/build/include/generated/.compat_vdso-offsets.h.cmd in
> > package kernel-devsrc contains reference to TMPDIR [buildpaths]
> > 
> 
> Did this just start happening ? I test this with all my kernel
> releases and I've never seen it.
> 
> So it would be good to put in the commit log what caused it to start.

We tested qemuriscv64 on the autobuilder which exposes it. It has
probably been doing that there for a while.

Cheers,

Richard