[oe-commits] Ihar Hrachyshka : Fixed concurrency problem for ZIP packed recipes.
git version control
git at git.openembedded.org
Tue Jul 19 17:03:39 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 6ca80453618fa308cc2d6329450aaf5dfdf2d610
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6ca80453618fa308cc2d6329450aaf5dfdf2d610
Author: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>
Date: Mon Jul 18 10:00:29 2011 -0700
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 at gmail.com>
Signed-off-by: Koen Kooi <koen at openembedded.org>
Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/base.bbclass | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3ca4e47..f12b3cb 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)
More information about the Openembedded-commits
mailing list