[oe-commits] Richard Purdie : kernel-devsrc: Ensure we don' t race against do_make_scripts from module-base.bbclass
git at git.openembedded.org
git at git.openembedded.org
Sun Dec 21 12:38:45 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 17fb28156737e803b36d7b3fd59d092fe152d126
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=17fb28156737e803b36d7b3fd59d092fe152d126
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Sun Dec 21 12:30:53 2014 +0000
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 at linuxfoundation.org>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 1557c27..9fb761b 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}"
More information about the Openembedded-commits
mailing list