From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 21 Dec 2014 12:30:53 +0000 (+0000)
Subject: kernel-devsrc: Ensure we don't race against do_make_scripts from module-base.bbclass
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~31802
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=17fb28156737e803b36d7b3fd59d092fe152d126;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

kernel-devsrc: Ensure we don't race against do_make_scripts from module-base.bbclass

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>
---

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 1557c276bbc..9fb761b46b7 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -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}"