mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
make-mod-scripts/kernel-devsrc: Fix objtool issues
Kernels which use tools/objtool can now fail when building external modules due to objtool being missing, the generated files can also cause problems for kernel-devsrc. Ensure objtool is generated in make-mod-scripts by also calling "make prepare". For devsrc, delete the generated binaries since they'd be native binaries and unsuitable for the target. The oeqa kernel module tests also need to have the additional "make prepare" step added. (From OE-Core rev: 52fd2993784b4218f5df4f343e7da45d964df305) Fixes [YOCTO #12860] (From OE-Core rev: 49b208fc7b3d52826ba57a86ed52bc30e181ff78) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Tweaked to add "make prepare" to module-base.bbclass instead of make-mod-scripts.bb] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
53d5f01d2d
commit
9e83976054
|
|
@ -23,5 +23,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
|||
do_make_scripts() {
|
||||
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
|
||||
make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
|
||||
-C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts
|
||||
-C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts prepare
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class KernelModuleTest(OERuntimeTestCase):
|
|||
@OETestDepends(['gcc.GccCompileTest.test_gcc_compile'])
|
||||
def test_kernel_module(self):
|
||||
cmds = [
|
||||
'cd /usr/src/kernel && make scripts',
|
||||
'cd /usr/src/kernel && make scripts prepare',
|
||||
'cd /tmp && make',
|
||||
'cd /tmp && insmod hellomod.ko',
|
||||
'lsmod | grep hellomod',
|
||||
|
|
|
|||
|
|
@ -69,6 +69,13 @@ do_install() {
|
|||
cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
|
||||
fi
|
||||
|
||||
# Remove fixdep/objtool as they won't be target binaries
|
||||
for i in fixdep objtool; do
|
||||
if [ -e $kerneldir/tools/objtool/$i ]; then
|
||||
rm -rf $kerneldir/tools/objtool/$i
|
||||
fi
|
||||
done
|
||||
|
||||
chown -R root:root ${D}
|
||||
}
|
||||
# Ensure we don't race against "make scripts" during cpio
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user