diff options
| author | Diego Sueiro <diego.sueiro@arm.com> | 2022-11-03 16:06:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-24 15:30:06 +0000 |
| commit | a4834b4f23ed1670a7c8bbc6faf54697a643e72e (patch) | |
| tree | 1daca8ea17c00245e520a33cb675da2d353e4148 /meta/classes-recipe | |
| parent | 4a28460712f11cad8c7b6e7eb26fdf330ba62eaa (diff) | |
| download | poky-a4834b4f23ed1670a7c8bbc6faf54697a643e72e.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: 69db1b345725af88088b57b0c696eddca5ca2d96)
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-recipe')
| -rw-r--r-- | meta/classes-recipe/kernel.bbclass | 16 |
1 files changed, 16 insertions, 0 deletions
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 () { | |||
| 591 | cp tools/objtool/objtool ${kerneldir}/tools/objtool/ | 591 | cp tools/objtool/objtool ${kerneldir}/tools/objtool/ |
| 592 | fi | 592 | fi |
| 593 | fi | 593 | fi |
| 594 | |||
| 595 | # When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need | ||
| 596 | # to copy the build assets generated for the randstruct seed to | ||
| 597 | # STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will | ||
| 598 | # generate those assets which will result in a different | ||
| 599 | # RANDSTRUCT_HASHED_SEED | ||
| 600 | if [ -d scripts/basic ]; then | ||
| 601 | mkdir -p ${kerneldir}/scripts | ||
| 602 | cp -r scripts/basic ${kerneldir}/scripts | ||
| 603 | fi | ||
| 604 | |||
| 605 | if [ -d scripts/gcc-plugins ]; then | ||
| 606 | mkdir -p ${kerneldir}/scripts | ||
| 607 | cp -r scripts/gcc-plugins ${kerneldir}/scripts | ||
| 608 | fi | ||
| 609 | |||
| 594 | } | 610 | } |
| 595 | 611 | ||
| 596 | # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware | 612 | # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware |
