summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-12-01 15:23:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-03 22:52:27 +0000
commitff003e076511fdbe9a6e775e987726dae43e2003 (patch)
tree7d82171f4c0c0d44b6aaab02c57ce15d815e5cfd
parent4fa68626bbcfd9795577e1426c27d00f4d9d1c17 (diff)
downloadopenembedded-core-contrib-ff003e076511fdbe9a6e775e987726dae43e2003.tar.gz
openembedded-core-contrib-ff003e076511fdbe9a6e775e987726dae43e2003.tar.bz2
openembedded-core-contrib-ff003e076511fdbe9a6e775e987726dae43e2003.zip
package_manager/ipk: neaten OPKGLIBDIR logic
oe.path.join handles path components starting with / for us. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager/ipk/__init__.py7
1 files changed, 1 insertions, 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)