From a4834b4f23ed1670a7c8bbc6faf54697a643e72e Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 3 Nov 2022 16:06:44 +0000 Subject: [PATCH] kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need to copy the build assets generated for the randstrutc seed to STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will generate those assets which will result in a different RANDSTRUCT_HASHED_SEED. (From OE-Core rev: 69db1b345725af88088b57b0c696eddca5ca2d96) Signed-off-by: Diego Sueiro Signed-off-by: Alexandre Belloni (cherry picked from commit b36303158b2e0273ff415bdedefb379f680b30fc) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes-recipe/kernel.bbclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 7bb3449223..3834a42fb9 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -591,6 +591,22 @@ do_shared_workdir () { cp tools/objtool/objtool ${kerneldir}/tools/objtool/ fi fi + + # When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need + # to copy the build assets generated for the randstruct seed to + # STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will + # generate those assets which will result in a different + # RANDSTRUCT_HASHED_SEED + if [ -d scripts/basic ]; then + mkdir -p ${kerneldir}/scripts + cp -r scripts/basic ${kerneldir}/scripts + fi + + if [ -d scripts/gcc-plugins ]; then + mkdir -p ${kerneldir}/scripts + cp -r scripts/gcc-plugins ${kerneldir}/scripts + fi + } # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware