summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDiego Sueiro <diego.sueiro@arm.com>2022-11-03 16:06:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-24 15:30:01 +0000
commit2836daa4c8a987a38d25bc2dc11619fcc3b061a8 (patch)
treefe36b5be547cc708e37e97a453964b4e60567c75 /meta/classes
parentd146636e7f9222247b3bb45bba09968b16c03865 (diff)
downloadpoky-2836daa4c8a987a38d25bc2dc11619fcc3b061a8.tar.gz
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: d6cb9dce1ffb14f9db497e9bb0cb7265ea4064ec) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index d878d4e167..ad2b296c2d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -585,6 +585,22 @@ do_shared_workdir () {
585 cp tools/objtool/objtool ${kerneldir}/tools/objtool/ 585 cp tools/objtool/objtool ${kerneldir}/tools/objtool/
586 fi 586 fi
587 fi 587 fi
588
589 # When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need
590 # to copy the build assets generated for the randstruct seed to
591 # STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will
592 # generate those assets which will result in a different
593 # RANDSTRUCT_HASHED_SEED
594 if [ -d scripts/basic ]; then
595 mkdir -p ${kerneldir}/scripts
596 cp -r scripts/basic ${kerneldir}/scripts
597 fi
598
599 if [ -d scripts/gcc-plugins ]; then
600 mkdir -p ${kerneldir}/scripts
601 cp -r scripts/gcc-plugins ${kerneldir}/scripts
602 fi
603
588} 604}
589 605
590# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware 606# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware