mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 06:32:12 +02:00
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 <philip.lorenz@bmw.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1e2b02a54f482159e21902eeb997b21e00e9588e) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
fb4eb8a09d
commit
d37ef8925a
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user