From 795843df09f7548afa9f94823a3932ea04b0f585 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Wed, 19 Oct 2011 13:15:19 +0200 Subject: [PATCH] module.bbclass: add lock to prevent error bulding ext modules When external modules are built, files in $STAGING_KERNEL_DIR/scripts/basic will/can get rebuilt. This raises a potential race condition. Prevent this by adding a lock around the do_make_scripts() function. Further, make sure that the kernel has been installed to the sysroot, prior to executing this new task. (From OE-Core rev: 8681b82e8b466929205edde7ba479f3ac1a6143e) (From OE-Core rev: 694e3016e25dff3f573291830d79982c8b8793a2) Signed-off-by: Anders Darander Signed-off-by: Richard Purdie --- meta/classes/module.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index 572df0d295..53c16b7389 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -14,8 +14,11 @@ do_make_scripts() { -C ${STAGING_KERNEL_DIR} scripts } +addtask make_scripts before do_compile +do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" +do_make_scripts[deptask] = "do_populate_sysroot" + module_do_compile() { - do_make_scripts unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ KERNEL_SRC=${STAGING_KERNEL_DIR} \