From 0931e855ed91de3fdefbd8f4b960110a68319cea Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 18 Jul 2011 10:00:29 -0700 Subject: 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 Signed-off-by: Koen Kooi Signed-off-by: Tom Rini Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/base.bbclass') 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) -- cgit v1.2.3-54-g00ecf