From 353fb8f18fe0f038fa3cb12960c979ab951af078 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 16 Feb 2024 10:31:10 +0000 Subject: [PATCH] kernel-devsrc: Improve vdso-offsets handling for qemuriscv64 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. This only apppears for qemurisc*. (From OE-Core rev: a8fde81958fef39589e0df3f57c1dffd028d1631) Signed-off-by: Richard Purdie --- 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 55cac1fc81..fafab475f3 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