diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/module-base.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/cases/kernelmodule.py | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 6fe77c01b7..64729770c7 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass | |||
@@ -23,5 +23,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
23 | do_make_scripts() { | 23 | do_make_scripts() { |
24 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 24 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS |
25 | make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ | 25 | make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ |
26 | -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts | 26 | -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts prepare |
27 | } | 27 | } |
diff --git a/meta/lib/oeqa/runtime/cases/kernelmodule.py b/meta/lib/oeqa/runtime/cases/kernelmodule.py index 11ad7b7f01..de1a5aa445 100644 --- a/meta/lib/oeqa/runtime/cases/kernelmodule.py +++ b/meta/lib/oeqa/runtime/cases/kernelmodule.py | |||
@@ -28,7 +28,7 @@ class KernelModuleTest(OERuntimeTestCase): | |||
28 | @OETestDepends(['gcc.GccCompileTest.test_gcc_compile']) | 28 | @OETestDepends(['gcc.GccCompileTest.test_gcc_compile']) |
29 | def test_kernel_module(self): | 29 | def test_kernel_module(self): |
30 | cmds = [ | 30 | cmds = [ |
31 | 'cd /usr/src/kernel && make scripts', | 31 | 'cd /usr/src/kernel && make scripts prepare', |
32 | 'cd /tmp && make', | 32 | 'cd /tmp && make', |
33 | 'cd /tmp && insmod hellomod.ko', | 33 | 'cd /tmp && insmod hellomod.ko', |
34 | 'lsmod | grep hellomod', | 34 | 'lsmod | grep hellomod', |
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index c1b5b7786d..8bbfa23e4b 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb | |||
@@ -69,6 +69,13 @@ do_install() { | |||
69 | cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o | 69 | cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o |
70 | fi | 70 | fi |
71 | 71 | ||
72 | # Remove fixdep/objtool as they won't be target binaries | ||
73 | for i in fixdep objtool; do | ||
74 | if [ -e $kerneldir/tools/objtool/$i ]; then | ||
75 | rm -rf $kerneldir/tools/objtool/$i | ||
76 | fi | ||
77 | done | ||
78 | |||
72 | chown -R root:root ${D} | 79 | chown -R root:root ${D} |
73 | } | 80 | } |
74 | # Ensure we don't race against "make scripts" during cpio | 81 | # Ensure we don't race against "make scripts" during cpio |