kernel-devsrc: Depend on virtual/kernel:do_compile

Since virtual/kernel do_compile modifies ${B}, we need to wait for
do_compile to copy everything across in order to ensure a deterministic
file set.

Currently, we race against the build and can see .debug directories, and
the do_compile dependency we will always see them. Add .debug to the
find path pruning.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 a7395c46b9cc6f22d43cd45f0fc3b48ff7d1325b..e36de1b812e67f62088fa79ab36e83ed74a641a4 100644 (file)
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -14,10 +14,11 @@ inherit linux-kernel-base
 inherit module-base
 
 # We need the kernel to be staged (unpacked, patched and configured) before
-# we can grab the source and make the kernel-devsrc package
+# we can grab the source and make the source package. We also need the bits from
+# ${B} not to change while we install, so virtual/kernel must finish do_compile.
 do_install[depends] += "virtual/kernel:do_shared_workdir"
 # Need the source, not just the output of populate_sysroot
-do_install[depends] += "virtual/kernel:do_configure"
+do_install[depends] += "virtual/kernel:do_compile"
 
 # There's nothing to do here, except install the source where we can package it
 do_fetch[noexec] = "1"
@@ -47,7 +48,7 @@ do_install() {
         # artifacts afterwards, and the extra i/o is not significant
         #
         cd ${B}
-        find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
+        find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
         cd ${S}
         find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir