From: Mariano Lopez Date: Fri, 13 Jan 2017 14:35:41 +0000 (+0000) Subject: lib/oe/package_manager.py: Fix extract for ipk and deb X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55aa669750db9ef9c8884e99dcb76850b0fac5b0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index a8644cc1c0e..a02bff4cafd 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1545,11 +1545,15 @@ 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' try: cmd = [ar_cmd, 'x', pkg_path] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) - cmd = [tar_cmd, 'xf', 'data.tar.*'] + cmd = [tar_cmd, 'xf', data_tar] output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: bb.utils.remove(tmp_dir, recurse=True)