mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
bitbake: fetch2: add support for .debs containing uncompressed data tarballs
Some .deb files contain uncompressed data tarballs which do not have an additional file extension after `.tar`. Add support for such cases while preserving the existing behaviour. (Bitbake rev: e3834deb427ceb1d1ae9a96c1e0dec990d7f3805) Signed-off-by: Isaac True <isaac.true@emlix.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7c4e8e0def
commit
a3bdd2144c
|
@ -1589,11 +1589,11 @@ class FetchMethod(object):
|
||||||
datafile = None
|
datafile = None
|
||||||
if output:
|
if output:
|
||||||
for line in output.decode().splitlines():
|
for line in output.decode().splitlines():
|
||||||
if line.startswith('data.tar.'):
|
if line.startswith('data.tar.') or line == 'data.tar':
|
||||||
datafile = line
|
datafile = line
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
raise UnpackError("Unable to unpack deb/ipk package - does not contain data.tar.* file", urldata.url)
|
raise UnpackError("Unable to unpack deb/ipk package - does not contain data.tar* file", urldata.url)
|
||||||
else:
|
else:
|
||||||
raise UnpackError("Unable to unpack deb/ipk package - could not list contents", urldata.url)
|
raise UnpackError("Unable to unpack deb/ipk package - could not list contents", urldata.url)
|
||||||
cmd = 'ar x %s %s && %s -p -f %s && rm %s' % (file, datafile, tar_cmd, datafile, datafile)
|
cmd = 'ar x %s %s && %s -p -f %s && rm %s' % (file, datafile, tar_cmd, datafile, datafile)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user