]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel-devsrc: Ensure we don't race against do_make_scripts from module-base.bbclass
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 21 Dec 2014 12:30:53 +0000 (12:30 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 21 Dec 2014 12:37:17 +0000 (12:37 +0000)
do_install for kernel-devsrc can race against do_make_scripts from
module-base.bbclass. Since there is a lock there to guard against concurrency
already, we can just use it here to avoid a race.

Ultimately, this can all likely be much more streamlined but this resolves
the immediate build failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-kernel/linux/kernel-devsrc.bb

index 1557c276bbca20ced4baa85a8884dd5cebaef383..9fb761b46b75b05d72999457579505eee3f46d9c 100644 (file)
@@ -55,6 +55,8 @@ do_install() {
                 cp ${S}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
         fi
 }
+# Ensure we don't race against "make scripts" during cpio
+do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
 
 PACKAGES = "kernel-devsrc"
 FILES_${PN} = "${KERNEL_SRC_PATH}"