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 583f9b775fc6c8b695583682a450b6924eafb8a5..ec55d4aa726471c69295ffe3361249be8595b0e9 100644 (file)
--- 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)