diff options
| author |   Angus Lees <gus@inodes.org> | 2019-02-05 12:55:33 +1100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 08:29:02 +0000 |
| commit | c09a22c421a57701f6b943eb50b9bae1545e5b39 (patch) | |
| tree | 7ef2269f321a892015f9ab820cf1758f30aee006 | |
| parent | 7b4d77d7f909c0ae27553fd9c480f069f12e468f (diff) | |
| download | openembedded-core-contrib-c09a22c421a57701f6b943eb50b9bae1545e5b39.tar.gz | |
package_manager.py: Use data.tar.xz for ipkg too
Commit b95b6ba1a2959e2294a8848fa35f20163388eb06 changed package_ipk.bbclass
to xz when building packages. This updates OpkgDpkgPM.extract() accordingly.
Signed-off-by: Angus Lees <gus@inodes.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/package_manager.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f26f597d03..955914bb48 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1118,10 +1118,7 @@ class OpkgDpkgPM(PackageManager): tmp_dir = tempfile.mkdtemp() current_dir = os.getcwd() os.chdir(tmp_dir) - if self.d.getVar('IMAGE_PKGTYPE') == 'deb': - data_tar = 'data.tar.xz' - else: - data_tar = 'data.tar.gz' + data_tar = 'data.tar.xz' try: cmd = [ar_cmd, 'x', pkg_path] @@ -1530,7 +1527,7 @@ class OpkgPM(OpkgDpkgPM): "trying to extract the package." % pkg) tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info) - bb.utils.remove(os.path.join(tmp_dir, "data.tar.gz")) + bb.utils.remove(os.path.join(tmp_dir, "data.tar.xz")) return tmp_dir |