From a3bdd2144c39772c1217c30bc09fbc55fb967c6c Mon Sep 17 00:00:00 2001 From: Isaac True Date: Mon, 26 May 2025 15:57:33 +0200 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 2de4f4f8c0..97cbd3567a 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1589,11 +1589,11 @@ class FetchMethod(object): datafile = None if output: for line in output.decode().splitlines(): - if line.startswith('data.tar.'): + if line.startswith('data.tar.') or line == 'data.tar': 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/ipk package - does not contain data.tar* file", urldata.url) else: 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)