summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2018-02-20 11:25:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:44 +0000
commitbb5a8acd65f98c37365bb03dcb898f2da23f17c2 (patch)
treea56515d1bb1d7c8922db2ca994c4edb3a4dd0a28 /meta/classes
parent2f030dfc082d6d8143c712cd9e18a0da13ec66e1 (diff)
downloadpoky-bb5a8acd65f98c37365bb03dcb898f2da23f17c2.tar.gz
make-mod-scripts: change how some kernel module tools are built
Remove do_make_scripts() from module-base.bbclass and put functionality in a recipe. This will build the scripts only once instead of each time an external module is built. [YOCTO #12228] (From OE-Core rev: ea12c46fe8748fb6606c603d463075a8624e6563) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/module-base.bbclass12
-rw-r--r--meta/classes/module.bbclass4
2 files changed, 3 insertions, 13 deletions
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index f851b85163..27bd69ff33 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -1,7 +1,8 @@
1inherit kernel-arch 1inherit kernel-arch
2 2
3# This is instead of DEPENDS = "virtual/kernel" 3# We do the dependency this way because the output is not preserved
4do_configure[depends] += "virtual/kernel:do_compile_kernelmodules" 4# in sstate, so we must force do_compile to run (once).
5do_configure[depends] += "make-mod-scripts:do_compile"
5 6
6export OS = "${TARGET_OS}" 7export OS = "${TARGET_OS}"
7export CROSS_COMPILE = "${TARGET_PREFIX}" 8export CROSS_COMPILE = "${TARGET_PREFIX}"
@@ -18,10 +19,3 @@ KERNEL_OBJECT_SUFFIX = ".ko"
18# kernel modules are generally machine specific 19# kernel modules are generally machine specific
19PACKAGE_ARCH = "${MACHINE_ARCH}" 20PACKAGE_ARCH = "${MACHINE_ARCH}"
20 21
21# Function to ensure the kernel scripts are created. Expected to
22# be called before do_compile. See module.bbclass for an example.
23do_make_scripts() {
24 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
25 make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
26 -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts
27}
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 78d1b21dbd..e344960244 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -1,9 +1,5 @@
1inherit module-base kernel-module-split pkgconfig 1inherit module-base kernel-module-split pkgconfig
2 2
3addtask make_scripts after do_prepare_recipe_sysroot before do_configure
4do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
5do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
6
7EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" 3EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}"
8 4
9MODULES_INSTALL_TARGET ?= "modules_install" 5MODULES_INSTALL_TARGET ?= "modules_install"