[PATCH] ipk ar/tar unpack

* [PATCH] ipk ar/tar unpack
@ 2020-07-15 13:20 chris.minnoy_ext
  2020-07-19 15:25 ` [bitbake-devel] " Richard Purdie
  0 siblings, 1 reply; 5+ messages in thread
From: chris.minnoy_ext @ 2020-07-15 13:20 UTC (permalink / raw)
  To: bitbake-devel

From: Chris Minnoy <chris.minnoy_ext@softathome.com>
Date: Wed, 15 Jul 2020 15:02:35 +0200
Subject: [PATCH] ipk packages can be formed with ar or tar. ar/tar can't 
read
  each other archives. This fixes the unpack to call the correct 
archiver based
  on the format.

---
  bitbake/lib/bb/fetch2/__init__.py | 40 ++++++++++++++++++++++++++++---
  1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/__init__.py 
b/bitbake/lib/bb/fetch2/__init__.py
index 2ada43befc..e79149a208 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1467,7 +1467,41 @@ class FetchMethod(object):
                      iterate_file = unpack_file
                  else:
                      cmd = 'rpm2cpio.sh %s | cpio -id' % (file)
-            elif file.endswith('.deb') or file.endswith('.ipk'):
+            elif file.endswith('.ipk'):
+                output = subprocess.check_output(['file', file], 
preexec_fn=subprocess_setup)
+                if output:
+                    if output.decode().find("current ar archive") != -1:
+                        output = subprocess.check_output(['ar', '-t', 
file], preexec_fn=subprocess_setup)
+                        datafile = None
+                        if output:
+                            for line in output.decode().splitlines():
+                                if line.startswith('data.tar.'):
+                                    datafile = line
+                                    break
+                            else:
+                                raise UnpackError("Unable to unpack ipk 
package - does not contain data.tar.* file", urldata.url)
+                        else:
+                            raise UnpackError("Unable to unpack ipk 
package - could not list contents", urldata.url)
+                        cmd = 'ar x %s %s && tar --no-same-owner -xpf 
%s && rm %s' % (file, datafile, datafile, datafile)
+                    elif output.decode().find("gzip compressed data") 
!= -1:
+                        output = subprocess.check_output(['tar', '-tf', 
file], preexec_fn=subprocess_setup)
+                        datafile = None
+                        if output:
+                            for line in output.decode().splitlines():
+                                if line.startswith('./data.tar.'):
+                                    datafile = line
+                                    break
+                            else:
+                                raise UnpackError("Unable to unpack ipk 
package - does not contain data.tar.* file", urldata.url)
+                        else:
+                            raise UnpackError("Unable to unpack ipk 
package - could not list contents", urldata.url)
+                        cmd = 'tar -xf %s %s && tar --no-same-owner 
-xpf %s && rm %s' % (file, datafile, datafile, datafile)
+
+                    else:
+                        raise UnpackError("Unable to unpack ipk package 
- unknown format", urldata.url)
+                else:
+                    raise UnpackError("Unable to detect .ipk file 
format - unknown format", urldata.url)
+            elif file.endswith('.deb'):
                  output = subprocess.check_output(['ar', '-t', file], 
preexec_fn=subprocess_setup)
                  datafile = None
                  if output:
@@ -1476,9 +1510,9 @@ class FetchMethod(object):
                              datafile = line
                              break
                      else:
-                        raise UnpackError("Unable to unpack deb/ipk 
package - does not contain data.tar.* file", urldata.url)
+                        raise UnpackError("Unable to unpack deb package 
- does not contain data.tar.* file", urldata.url)
                  else:
-                    raise UnpackError("Unable to unpack deb/ipk package 
- could not list contents", urldata.url)
+                    raise UnpackError("Unable to unpack deb package - 
could not list contents", urldata.url)
                  cmd = 'ar x %s %s && tar --no-same-owner -xpf %s && rm 
%s' % (file, datafile, datafile, datafile)

          # If 'subdir' param exists, create a dir and use it as 
destination for unpack cmd
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread