[OE-core] [PATCH v2 1/1] Fixed concurrency problem for ZIP packed recipes.
Tom Rini
tom_rini at mentor.com
Fri Jul 15 17:35:22 UTC 2011
From: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>
The problem occured when unzip-native is not yet staged, and ZIP
archive unpacking already started resulting in failed do_unpack task.
Added NEED_UNZIP_FOR_UNPACK variable to use in recipes which do_unpack
with unzip utility but doesn't have '.zip' in SRC_URI (f.e. .EXE
windows self-extraction binaries).
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>
---
meta/classes/base.bbclass | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0c2c546..35fcec2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -354,6 +354,15 @@ 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
+ need_unzip = bb.data.getVar('NEED_UNZIP_FOR_UNPACK', d, 1)
+ src_uri = bb.data.getVar('SRC_URI', d, 1)
+
+ if ".zip" in src_uri or need_unzip == "1":
+ 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)
--
1.7.0.4
More information about the Openembedded-core
mailing list