From: Diego Sueiro <[email protected]>

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 <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
(cherry picked from commit b36303158b2e0273ff415bdedefb379f680b30fc)
Signed-off-by: Steve Sakoman <[email protected]>
---
 meta/classes/kernel.bbclass | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 () {
                        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
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173630): 
https://lists.openembedded.org/g/openembedded-core/message/173630
Mute This Topic: https://lists.openembedded.org/mt/95152024/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to