From 3e6f03797c3b647786776c97b98173b2f08d1258 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 5 Jul 2022 15:55:09 -0400 Subject: [PATCH] kernel-devsrc: fix reproducibility and buildpaths QA warning We've been removing .vdso-offsets.h.cmd for quite some time, as it is not required to regenerate scripts or to satisfy the prepare target in the kernel source. That being said, there is a secondary location that this file may be found, and since we aren't detecting or removing it, we end up with embedded build paths, which cause both reproducibility and buildpaths QA warnings. We can test for both files, and force remove them if present, and we'll fix this new location of the file and not risk breaking any old kernels. (From OE-Core rev: ff5b50458a7018c157df9b5f039d80434b0e6e24) Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e0a9433685397b716920fa9ad5d5a7be95c496f7) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 9654488a54..ee5d8d9ab0 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -128,8 +128,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 ]; then - rm $kerneldir/include/generated/.vdso-offsets.h.cmd + if [ -e $kerneldir/include/generated/.vdso-offsets.h.cmd ] || + [ -e $kerneldir/build/include/generated/.vdso-offsets.h.cmd ]; then + rm -f $kerneldir/include/generated/.vdso-offsets.h.cmd + rm -f $kerneldir/build/include/generated/.vdso-offsets.h.cmd fi )