From ff003e076511fdbe9a6e775e987726dae43e2003 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 1 Dec 2020 15:23:04 +0000 Subject: package_manager/ipk: neaten OPKGLIBDIR logic oe.path.join handles path components starting with / for us. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager/ipk/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py index 416ed23d47..2753b139ed 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/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) -- cgit 1.2.3-korg