summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-06-15 23:22:57 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 08:56:10 +0100
commit8baefb49d0bf9d3dd757d9b2359e0a9f4f33dd60 (patch)
tree1434323f9394a82a835b3e91fab6c43d13844017
parent4bbfd25345858720d14c66b84f38fee42168915f (diff)
downloadopenembedded-core-contrib-8baefb49d0bf9d3dd757d9b2359e0a9f4f33dd60.tar.gz
openembedded-core-contrib-8baefb49d0bf9d3dd757d9b2359e0a9f4f33dd60.tar.bz2
openembedded-core-contrib-8baefb49d0bf9d3dd757d9b2359e0a9f4f33dd60.zip
archiver: create dir 'B' explicitly while WORKDIR changed
In the do_unpack_and_patch task of archiver, the changed 'WORKDIR' also casued 'B' changed, create dir 'B' for the possibly requiring of the tasks which executed in do_unpack_and_patch task. Such as cut-ecgl's do_patch required 'B' existed: ... | cp: target 'tmp/work/x86_64-wrs-linux/cut-ecgl/1.0-r0/archiver-work /cut-ecgl-1.0' is not a directory ... | ERROR: Function failed: do_patch (log file is located at tmp/work/ x86_64-wrs-linux/cut-ecgl/1.0-r0/temp/do_unpack_and_patch/ log.do_unpack_and_patch.11886) ... The 'B' dir is implicitly created at the task executing time while the task tag 'dirs' is not assigned. In the above cut-ecgl example, the 'B' was created at the wrl_buildlink executing time which is the prefuncs of task do_unpack. So the following do_patch could use 'B' correctly. But wrl_buildlink is unnecessary and not invoked in the do_unpack_and_patch task. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/archiver.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 8d8e7c42a8..efd413bdc4 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -276,6 +276,11 @@ python do_unpack_and_patch() {
# Change the WORKDIR to make do_unpack do_patch run in another dir.
d.setVar('WORKDIR', d.getVar('ARCHIVER_WORKDIR', True))
+ # The changed 'WORKDIR' also casued 'B' changed, create dir 'B' for the
+ # possibly requiring of the following tasks (such as some recipes's
+ # do_patch required 'B' existed).
+ bb.utils.mkdirhier(d.getVar('B', True))
+
# The kernel source is ready after do_validate_branches
if bb.data.inherits_class('kernel-yocto', d):
bb.build.exec_func('do_unpack', d)