summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:30:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:17 +0000
commit17fb28156737e803b36d7b3fd59d092fe152d126 (patch)
tree579c5dd8c31c20b82d6ab80314791b7d2a45600f
parent5fa888894384eff18df77d0a5aaa007eba1406c8 (diff)
downloadopenembedded-core-contrib-17fb28156737e803b36d7b3fd59d092fe152d126.tar.gz
openembedded-core-contrib-17fb28156737e803b36d7b3fd59d092fe152d126.tar.bz2
openembedded-core-contrib-17fb28156737e803b36d7b3fd59d092fe152d126.zip
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>
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 1557c276bb..9fb761b46b 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}"