summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihar.hrachyshka@gmail.com>2011-07-18 10:00:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-20 15:27:31 +0100
commit0931e855ed91de3fdefbd8f4b960110a68319cea (patch)
tree58644452f7eea108bdc2d610dab65a4206901393 /meta
parentf1d3dae747ebaf521dd95c83687f8857b12be016 (diff)
downloadpoky-0931e855ed91de3fdefbd8f4b960110a68319cea.tar.gz
Fixed concurrency problem for ZIP packed recipes.
The problem occured when unzip-native is not yet staged, and ZIP archive unpacking already started resulting in failed do_unpack task. (oe.dev has a NEED_UNZIP_FOR_UNPACK variable we did not bring over) [RP: Use srcuri from already existing variable] (From OE-Core rev: 6ca80453618fa308cc2d6329450aaf5dfdf2d610) Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> Signed-off-by: Koen Kooi <koen@openembedded.org> Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3ca4e47767..f12b3cb870 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -354,6 +354,12 @@ python () {
354 depends = depends + " xz-native:do_populate_sysroot" 354 depends = depends + " xz-native:do_populate_sysroot"
355 bb.data.setVarFlag('do_unpack', 'depends', depends, d) 355 bb.data.setVarFlag('do_unpack', 'depends', depends, d)
356 356
357 # unzip-native should already be staged before unpacking ZIP recipes
358 if ".zip" in srcuri:
359 depends = bb.data.getVarFlag('do_unpack', 'depends', d) or ""
360 depends = depends + " unzip-native:do_populate_sysroot"
361 bb.data.setVarFlag('do_unpack', 'depends', depends, d)
362
357 # 'multimachine' handling 363 # 'multimachine' handling
358 mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1) 364 mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
359 pkg_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) 365 pkg_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)