1 files changed, 7 insertions, 1 deletions

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)