summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
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-19 18:03:04 +0100
commit6ca80453618fa308cc2d6329450aaf5dfdf2d610 (patch)
tree593839d06f69a99f05ae5f724cc31304f0501589 /meta/classes/base.bbclass
parentb8c76452e7e2681fb2c846e83bc62a0a2173eee9 (diff)
downloadopenembedded-core-contrib-6ca80453618fa308cc2d6329450aaf5dfdf2d610.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] 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/classes/base.bbclass')
-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 () {
depends = depends + " xz-native:do_populate_sysroot"
bb.data.setVarFlag('do_unpack', 'depends', depends, d)
+ # unzip-native should already be staged before unpacking ZIP recipes
+ if ".zip" in srcuri:
+ depends = bb.data.getVarFlag('do_unpack', 'depends', d) or ""
+ depends = depends + " unzip-native:do_populate_sysroot"
+ bb.data.setVarFlag('do_unpack', 'depends', depends, d)
+
# 'multimachine' handling
mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
pkg_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)