From d37ef8925ab293b014cde6633954bbcc880bf851 Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Tue, 28 May 2024 16:30:58 +0200 Subject: [PATCH] ipk: Fix clean up of extracted IPK payload It turns out that the IPK payload tarball was actually cleaned up in the concrete package manager implementation (most likely because at some point Debian and IPK packages used different compression algorithms). Globbing removes this ambiguity so move the removal of the payload into the common extract method. (From OE-Core rev: ec1c6bc79f5ca219e77a379bbabc2dad808d2020) Signed-off-by: Philip Lorenz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1e2b02a54f482159e21902eeb997b21e00e9588e) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/ipk/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 0f0038d00d..47e72cc7a6 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py @@ -159,6 +159,7 @@ class OpkgDpkgPM(PackageManager): bb.note("Extracted %s to %s" % (pkg_path, tmp_dir)) bb.utils.remove(os.path.join(tmp_dir, "debian-binary")) bb.utils.remove(os.path.join(tmp_dir, "control.tar.gz")) + bb.utils.remove(os.path.join(tmp_dir, data_tar)) os.chdir(current_dir) return tmp_dir @@ -511,7 +512,4 @@ class OpkgPM(OpkgDpkgPM): bb.fatal("Unable to get information for package '%s' while " "trying to extract the package." % pkg) - tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info) - bb.utils.remove(os.path.join(tmp_dir, "data.tar.zst")) - - return tmp_dir + return super(OpkgPM, self).extract(pkg, pkg_info)