summaryrefslogtreecommitdiff
path: root/poky/meta/lib/oe/package_manager/ipk/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta/lib/oe/package_manager/ipk/__init__.py')
-rw-r--r--poky/meta/lib/oe/package_manager/ipk/__init__.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/poky/meta/lib/oe/package_manager/ipk/__init__.py b/poky/meta/lib/oe/package_manager/ipk/__init__.py
index 416ed23d47..da488c1c7f 100644
--- a/poky/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/poky/meta/lib/oe/package_manager/ipk/__init__.py
@@ -172,12 +172,7 @@ class OpkgPM(OpkgDpkgPM):
if prepare_index:
create_packages_dir(self.d, self.deploy_dir, d.getVar("DEPLOY_DIR_IPK"), "package_write_ipk", filterbydependencies)
- opkg_lib_dir = self.d.getVar('OPKGLIBDIR')
- if opkg_lib_dir[0] == "/":
- opkg_lib_dir = opkg_lib_dir[1:]
-
- self.opkg_dir = os.path.join(target_rootfs, opkg_lib_dir, "opkg")
-
+ self.opkg_dir = oe.path.join(target_rootfs, self.d.getVar('OPKGLIBDIR'), "opkg")
bb.utils.mkdirhier(self.opkg_dir)
self.saved_opkg_dir = self.d.expand('${T}/saved/%s' % self.task_name)
@@ -408,9 +403,9 @@ class OpkgPM(OpkgDpkgPM):
bb.fatal(result)
def remove_packaging_data(self):
+ cachedir = oe.path.join(self.target_rootfs, self.d.getVar("localstatedir"), "cache", "opkg")
bb.utils.remove(self.opkg_dir, True)
- # create the directory back, it's needed by PM lock
- bb.utils.mkdirhier(self.opkg_dir)
+ bb.utils.remove(cachedir, True)
def remove_lists(self):
if not self.from_feeds: