[OE-core] [PATCH] package_manager.py: Use data.tar.xz for ipkg too
Angus Lees
gus at inodes.org
Tue Feb 5 01:55:33 UTC 2019
Commit b95b6ba1a2959e2294a8848fa35f20163388eb06 changed package_ipk.bbclass
to xz when building packages. This updates OpkgDpkgPM.extract() accordingly.
Signed-off-by: Angus Lees <gus at inodes.org>
---
This should also be backported to sumo.
>From a quick grep, I note recipes-devtools/build-compare probably also
needs updating. I have not done so in this patch, because I don't
(knowingly) use that tool and have no idea how to test it.
meta/lib/oe/package_manager.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 2d8aeba037..6b45f1b2d4 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1030,10 +1030,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]
@@ -1432,7 +1429,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
--
2.11.0
More information about the Openembedded-core
mailing list