summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jörns <ejo@pengutronix.de>2023-04-26 11:37:12 +0200
committerSteve Sakoman <steve@sakoman.com>2023-05-18 04:29:33 -1000
commit6c64c50802d3ea7c1e6f226d5360ef197c6bf2cf (patch)
treeb372612c122addbff8b3f46f6d7033845c9e98d3
parentabe094e7896fe35d3de7a9d43646d5cf987726ad (diff)
downloadpoky-6c64c50802d3ea7c1e6f226d5360ef197c6bf2cf.tar.gz
package_manager/ipk: fix config path generation in _create_custom_config()
"sysconfdir" contains "/" by definition and thus using os.path.join() leads to self.target_rootfs being always ignored (and thus attempting to generate paths in host's /etc). Use oe.path.join() instead which was made for this purpose. (From OE-Core rev: 116e2b1d0c75c6be333339812468550145915774) Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8414c504138f6de663f5130c6b4a6ede5605d88b) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oe/package_manager/ipk/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py
index caca522fd6..e6f9c08e2b 100644
--- a/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/meta/lib/oe/package_manager/ipk/__init__.py
@@ -247,7 +247,7 @@ class OpkgPM(OpkgDpkgPM):
247 """ 247 """
248 if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "": 248 if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "":
249 for arch in self.pkg_archs.split(): 249 for arch in self.pkg_archs.split():
250 cfg_file_name = os.path.join(self.target_rootfs, 250 cfg_file_name = oe.path.join(self.target_rootfs,
251 self.d.getVar("sysconfdir"), 251 self.d.getVar("sysconfdir"),
252 "opkg", 252 "opkg",
253 "local-%s-feed.conf" % arch) 253 "local-%s-feed.conf" % arch)