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.

Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit b36303158b2e0273ff415bdedefb379f680b30fc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 7bb344922330e227bb689eef2ef8ff680199d551..3834a42fb996da93c8fea8005ed1650a9e22cafb 100644 (file)
--- 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