summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2015-01-15 11:54:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 09:13:02 +0000
commit20dd877d36e85911b57bec079cf978a577fba866 (patch)
tree53607a6475343d364bb09f5d7f6eaf72b3d00ca9 /meta
parentd8c839afa96925b27909eb5a7b89ee83c87924bc (diff)
downloadopenembedded-core-20dd877d36e85911b57bec079cf978a577fba866.tar.gz
openembedded-core-20dd877d36e85911b57bec079cf978a577fba866.tar.bz2
openembedded-core-20dd877d36e85911b57bec079cf978a577fba866.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index a7395c46b9..e36de1b812 100644
--- 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