summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAngus Lees <gus@inodes.org>2019-02-05 12:55:33 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-06 08:29:06 +0000
commitdbb832b8cfafd072b09bed0e9a6febad3f83e431 (patch)
treed73c4efd5ca690dab8966953090932736aafdc17 /meta/lib
parentd5abdf023bbdd32cb2a35cb40e828127dd50ea3a (diff)
downloadpoky-dbb832b8cfafd072b09bed0e9a6febad3f83e431.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. (From OE-Core rev: c09a22c421a57701f6b943eb50b9bae1545e5b39) Signed-off-by: Angus Lees <gus@inodes.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py7
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):
1118 tmp_dir = tempfile.mkdtemp() 1118 tmp_dir = tempfile.mkdtemp()
1119 current_dir = os.getcwd() 1119 current_dir = os.getcwd()
1120 os.chdir(tmp_dir) 1120 os.chdir(tmp_dir)
1121 if self.d.getVar('IMAGE_PKGTYPE') == 'deb': 1121 data_tar = 'data.tar.xz'
1122 data_tar = 'data.tar.xz'
1123 else:
1124 data_tar = 'data.tar.gz'
1125 1122
1126 try: 1123 try:
1127 cmd = [ar_cmd, 'x', pkg_path] 1124 cmd = [ar_cmd, 'x', pkg_path]
@@ -1530,7 +1527,7 @@ class OpkgPM(OpkgDpkgPM):
1530 "trying to extract the package." % pkg) 1527 "trying to extract the package." % pkg)
1531 1528
1532 tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info) 1529 tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info)
1533 bb.utils.remove(os.path.join(tmp_dir, "data.tar.gz")) 1530 bb.utils.remove(os.path.join(tmp_dir, "data.tar.xz"))
1534 1531
1535 return tmp_dir 1532 return tmp_dir
1536 1533