From 71711f5f20fc3744be4c9188a75606f60d524ff9 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Wed, 1 Apr 2020 16:58:05 +0200 Subject: lib/oe/package_manager: don't try to rm /var/lib/opkg As opkglibdir starts with a /, os.path.join will ignore self.target_rootfs, leading to an attempt to remove /var/lib/opkg. This only fails if it exists on the host, explaining why this remained undiscovered for long. Signed-off-by: Jan Luebbe Signed-off-by: Richard Purdie (cherry picked from commit fc974977cea389f54e7fc7de7b1c8fd3d8bafe58) Signed-off-by: Anuj Mittal --- meta/lib/oe/package_manager.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 4d9e501f0e..e0b15dc9b4 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1791,8 +1791,7 @@ class DpkgPM(OpkgDpkgPM): open(os.path.join(target_dpkg_dir, "available"), "w+").close() def remove_packaging_data(self): - bb.utils.remove(os.path.join(self.target_rootfs, - self.d.getVar('opkglibdir')), True) + bb.utils.remove(self.target_rootfs + self.d.getVar('opkglibdir'), True) bb.utils.remove(self.target_rootfs + "/var/lib/dpkg/", True) def fix_broken_dependencies(self): -- cgit 1.2.3-korg