diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:30:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:37:55 +0000 |
| commit | 6eb95d654e6e674f43170a906f8aee1ef90c6827 (patch) | |
| tree | 04ed3e4f1a491a0260d89f0ef882bde533acb8ca /meta/recipes-kernel | |
| parent | da2764e1843239b188a9c5e6cc7105ef6f7d77dc (diff) | |
| download | poky-6eb95d654e6e674f43170a906f8aee1ef90c6827.tar.gz | |
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.
(From OE-Core rev: 17fb28156737e803b36d7b3fd59d092fe152d126)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 2 |
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() { | |||
| 55 | cp ${S}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o | 55 | cp ${S}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o |
| 56 | fi | 56 | fi |
| 57 | } | 57 | } |
| 58 | # Ensure we don't race against "make scripts" during cpio | ||
| 59 | do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | ||
| 58 | 60 | ||
| 59 | PACKAGES = "kernel-devsrc" | 61 | PACKAGES = "kernel-devsrc" |
| 60 | FILES_${PN} = "${KERNEL_SRC_PATH}" | 62 | FILES_${PN} = "${KERNEL_SRC_PATH}" |