summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
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:53:09 +0000
commit13bc11247447eabcfb4279fbd4fe64aacc08a5ea (patch)
treeedfa8a390e7af7ce217a99497021199fa8a34bc1 /meta/lib/oe
parent58692017e0785d376aae205af541dec186ba9475 (diff)
downloadpoky-13bc11247447eabcfb4279fbd4fe64aacc08a5ea.tar.gz
package_manager/ipk: neaten OPKGLIBDIR logic
oe.path.join handles path components starting with / for us. (From OE-Core rev: ff003e076511fdbe9a6e775e987726dae43e2003) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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):
172 if prepare_index: 172 if prepare_index:
173 create_packages_dir(self.d, self.deploy_dir, d.getVar("DEPLOY_DIR_IPK"), "package_write_ipk", filterbydependencies) 173 create_packages_dir(self.d, self.deploy_dir, d.getVar("DEPLOY_DIR_IPK"), "package_write_ipk", filterbydependencies)
174 174
175 opkg_lib_dir = self.d.getVar('OPKGLIBDIR') 175 self.opkg_dir = oe.path.join(target_rootfs, self.d.getVar('OPKGLIBDIR'), "opkg")
176 if opkg_lib_dir[0] == "/":
177 opkg_lib_dir = opkg_lib_dir[1:]
178
179 self.opkg_dir = os.path.join(target_rootfs, opkg_lib_dir, "opkg")
180
181 bb.utils.mkdirhier(self.opkg_dir) 176 bb.utils.mkdirhier(self.opkg_dir)
182 177
183 self.saved_opkg_dir = self.d.expand('${T}/saved/%s' % self.task_name) 178 self.saved_opkg_dir = self.d.expand('${T}/saved/%s' % self.task_name)