diff options
| -rw-r--r-- | meta/classes/base.bbclass | 8 |
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() { | |||
| 256 | continue | 256 | continue |
| 257 | local = os.path.realpath(local) | 257 | local = os.path.realpath(local) |
| 258 | lf = bb.utils.lockfile(urldata[url].lockfile) | 258 | lf = bb.utils.lockfile(urldata[url].lockfile) |
| 259 | ret = oe_unpack_file(local, localdata, url) | 259 | if bb.fetch.__version__ == "1": |
| 260 | ret = oe_unpack_file(local, localdata, url) | ||
| 261 | else: | ||
| 262 | # use bb.fetch2 unpack API | ||
| 263 | ud = urldata[url] | ||
| 264 | rootdir = bb.data.getVar('WORKDIR', localdata, True) | ||
| 265 | ret = ud.method.unpack(ud, rootdir, localdata) | ||
| 260 | bb.utils.unlockfile(lf) | 266 | bb.utils.unlockfile(lf) |
| 261 | if not ret: | 267 | if not ret: |
| 262 | raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret) | 268 | raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret) |