From b12d79ef5e601f3399f1a8f51c97b3795f54dc2a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 May 2015 10:31:05 +0100 Subject: module/module-base/lttng-modules: Improve kernel module dependencies If we have DEPENDS = "virtual/kernel" is means that the kernel module depends on the kernel's do_populate_sysroot task. This is not entirely desireable since that depends on do_install which depends on do_compile_kernelmodules and so on. In a situation where rm_work in involved this can cause some pretty length build cycles after the kernel workdir has been cleaned up by rm_work. As well as removing this, take the opportunity to clean up duplicated dependency lines, tweak the dependency of make_scripts for the same reason and generally try and make things more readable. (From OE-Core rev: a641247d262971db2d44815c5a668e7e50bdaf4f) Signed-off-by: Richard Purdie --- meta/classes/module-base.bbclass | 5 +++-- meta/classes/module.bbclass | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 3eb2e9226e..8be26c4f5e 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -1,5 +1,8 @@ inherit kernel-arch +# This is instead of DEPENDS = "virtual/kernel" +do_configure[depends] += "virtual/kernel:do_shared_workdir" + export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" @@ -15,8 +18,6 @@ KERNEL_OBJECT_SUFFIX = ".ko" # kernel modules are generally machine specific PACKAGE_ARCH = "${MACHINE_ARCH}" -do_configure[depends] += "virtual/kernel:do_shared_workdir" - # Function to ensure the kernel scripts are created. Expected to # be called before do_compile. See module.bbclass for an exmaple. do_make_scripts() { diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index a03cc74de4..0952c0cca7 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -1,10 +1,8 @@ -DEPENDS += "virtual/kernel" - inherit module-base kernel-module-split addtask make_scripts after do_patch before do_compile do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" -do_make_scripts[deptask] = "do_populate_sysroot" +do_make_scripts[depends] += "virtual/kernel:do_shared_workdir" EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" -- cgit v1.2.3-54-g00ecf