summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/package_manager.py
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2017-01-13 14:35:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:47:20 +0000
commit55aa669750db9ef9c8884e99dcb76850b0fac5b0 (patch)
tree852215bc1432fd047f690ffa68120f63ea238240 /meta/lib/oe/package_manager.py
parentf4fedefe49d4724d6086e41bfc49753eab15d3e1 (diff)
downloadpoky-55aa669750db9ef9c8884e99dcb76850b0fac5b0.tar.gz
lib/oe/package_manager.py: Fix extract for ipk and deb
With the move to use lists instead of strings in subprocess calls, package extraction was broken for ipk and deb. This fixes this issue. (From OE-Core rev: 3e1d8e5c7ac3238eda85ee95dfef044bef2a6411) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r--meta/lib/oe/package_manager.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index a8644cc1c0..a02bff4caf 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1545,11 +1545,15 @@ class OpkgDpkgPM(PackageManager):
1545 tmp_dir = tempfile.mkdtemp() 1545 tmp_dir = tempfile.mkdtemp()
1546 current_dir = os.getcwd() 1546 current_dir = os.getcwd()
1547 os.chdir(tmp_dir) 1547 os.chdir(tmp_dir)
1548 if self.d.getVar('IMAGE_PKGTYPE') == 'deb':
1549 data_tar = 'data.tar.xz'
1550 else:
1551 data_tar = 'data.tar.gz'
1548 1552
1549 try: 1553 try:
1550 cmd = [ar_cmd, 'x', pkg_path] 1554 cmd = [ar_cmd, 'x', pkg_path]
1551 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) 1555 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
1552 cmd = [tar_cmd, 'xf', 'data.tar.*'] 1556 cmd = [tar_cmd, 'xf', data_tar]
1553 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) 1557 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
1554 except subprocess.CalledProcessError as e: 1558 except subprocess.CalledProcessError as e:
1555 bb.utils.remove(tmp_dir, recurse=True) 1559 bb.utils.remove(tmp_dir, recurse=True)