summaryrefslogtreecommitdiffstats
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 23:08:18 +0000
commitfddf343bec616bbbe3b69b03c180cffe8117356f (patch)
tree354d738e9a034b1dd0fbd606384df69d06788036
parent14fa1343eccd6296120a5e4e054b21b83c57c3e0 (diff)
downloadpoky-fddf343bec616bbbe3b69b03c180cffe8117356f.tar.gz
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. (From OE-Core rev: 20dd877d36e85911b57bec079cf978a577fba866) 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>
-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
14inherit module-base 14inherit module-base
15 15
16# We need the kernel to be staged (unpacked, patched and configured) before 16# We need the kernel to be staged (unpacked, patched and configured) before
17# we can grab the source and make the kernel-devsrc package 17# we can grab the source and make the source package. We also need the bits from
18# ${B} not to change while we install, so virtual/kernel must finish do_compile.
18do_install[depends] += "virtual/kernel:do_shared_workdir" 19do_install[depends] += "virtual/kernel:do_shared_workdir"
19# Need the source, not just the output of populate_sysroot 20# Need the source, not just the output of populate_sysroot
20do_install[depends] += "virtual/kernel:do_configure" 21do_install[depends] += "virtual/kernel:do_compile"
21 22
22# There's nothing to do here, except install the source where we can package it 23# There's nothing to do here, except install the source where we can package it
23do_fetch[noexec] = "1" 24do_fetch[noexec] = "1"
@@ -47,7 +48,7 @@ do_install() {
47 # artifacts afterwards, and the extra i/o is not significant 48 # artifacts afterwards, and the extra i/o is not significant
48 # 49 #
49 cd ${B} 50 cd ${B}
50 find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir 51 find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
51 cd ${S} 52 cd ${S}
52 find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir 53 find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
53 54