From: Yu Ke <ke.yu@intel.com>
Date: Tue, 18 Jan 2011 14:38:34 +0000 (+0800)
Subject: base.bbclass: use bb.fetch2 unpack API
X-Git-Tag: 2011-1~2712
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8615b0e282baadf1ac342ec38b7c79e0ac351613;p=openembedded-core.git

base.bbclass: use bb.fetch2 unpack API

Signed-off-by: Yu Ke <ke.yu@intel.com>
---

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 583f9b775f..ec55d4aa72 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -256,7 +256,13 @@ python base_do_unpack() {
 			continue
 		local = os.path.realpath(local)
 		lf = bb.utils.lockfile(urldata[url].lockfile)
-		ret = oe_unpack_file(local, localdata, url)
+		if bb.fetch.__version__ == "1":
+			ret = oe_unpack_file(local, localdata, url)
+		else:
+			# use bb.fetch2 unpack API
+			ud = urldata[url]
+			rootdir = bb.data.getVar('WORKDIR', localdata, True)
+			ret = ud.method.unpack(ud, rootdir, localdata)
 		bb.utils.unlockfile(lf)
 		if not ret:
 			raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret)