summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 10:31:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:43:56 +0100
commitb12d79ef5e601f3399f1a8f51c97b3795f54dc2a (patch)
tree922f8a802bc4ea55088a0c238b96af4f0b91d380 /meta
parent57aeb9e45f75ebf449f07d909cbeae598284fe32 (diff)
downloadpoky-b12d79ef5e601f3399f1a8f51c97b3795f54dc2a.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/module-base.bbclass5
-rw-r--r--meta/classes/module.bbclass4
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb3
3 files changed, 4 insertions, 8 deletions
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 @@
1inherit kernel-arch 1inherit kernel-arch
2 2
3# This is instead of DEPENDS = "virtual/kernel"
4do_configure[depends] += "virtual/kernel:do_shared_workdir"
5
3export OS = "${TARGET_OS}" 6export OS = "${TARGET_OS}"
4export CROSS_COMPILE = "${TARGET_PREFIX}" 7export CROSS_COMPILE = "${TARGET_PREFIX}"
5 8
@@ -15,8 +18,6 @@ KERNEL_OBJECT_SUFFIX = ".ko"
15# kernel modules are generally machine specific 18# kernel modules are generally machine specific
16PACKAGE_ARCH = "${MACHINE_ARCH}" 19PACKAGE_ARCH = "${MACHINE_ARCH}"
17 20
18do_configure[depends] += "virtual/kernel:do_shared_workdir"
19
20# Function to ensure the kernel scripts are created. Expected to 21# Function to ensure the kernel scripts are created. Expected to
21# be called before do_compile. See module.bbclass for an exmaple. 22# be called before do_compile. See module.bbclass for an exmaple.
22do_make_scripts() { 23do_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 @@
1DEPENDS += "virtual/kernel"
2
3inherit module-base kernel-module-split 1inherit module-base kernel-module-split
4 2
5addtask make_scripts after do_patch before do_compile 3addtask make_scripts after do_patch before do_compile
6do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" 4do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
7do_make_scripts[deptask] = "do_populate_sysroot" 5do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
8 6
9EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" 7EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}"
10 8
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb
index 4cf01caa51..420b691db1 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb
@@ -6,9 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \
6 file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ 6 file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
7 file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" 7 file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad"
8 8
9DEPENDS = "virtual/kernel"
10do_configure[depends] += "virtual/kernel:do_shared_workdir"
11
12inherit module 9inherit module
13 10
14SRCREV = "1b2a5429de815c95643df2eadf91253909708728" 11SRCREV = "1b2a5429de815c95643df2eadf91253909708728"