[oe-commits] [openembedded-core] 02/65: make-mod-scripts/kernel-devsrc: Fix objtool issues

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 49b208fc7b3d52826ba57a86ed52bc30e181ff78
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Jul 28 16:49:49 2018 +0800

    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]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    [Tweaked to add "make prepare" to module-base.bbclass instead of
    make-mod-scripts.bb]
    Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/module-base.bbclass            | 2 +-
 meta/lib/oeqa/runtime/cases/kernelmodule.py | 2 +-
 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 6fe77c0..6472977 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -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
 }
diff --git a/meta/lib/oeqa/runtime/cases/kernelmodule.py b/meta/lib/oeqa/runtime/cases/kernelmodule.py
index 11ad7b7..de1a5aa 100644
--- a/meta/lib/oeqa/runtime/cases/kernelmodule.py
+++ b/meta/lib/oeqa/runtime/cases/kernelmodule.py
@@ -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',
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index c1b5b77..8bbfa23 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.