diff options
author | Enrico Jörns <ejo@pengutronix.de> | 2023-04-26 11:37:12 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:25 +0100 |
commit | c3380dbe3d684e3bccb99fbab53d72a5c6a78156 (patch) | |
tree | 5efe5d3d63b1c3d978c6c46c1371a3303cd29f92 /meta/lib/oe | |
parent | 94571aa1b7fa2d9169a61316b57efab18eb64c99 (diff) | |
download | poky-c3380dbe3d684e3bccb99fbab53d72a5c6a78156.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: 8414c504138f6de663f5130c6b4a6ede5605d88b)
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>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/package_manager/ipk/__init__.py | 2 |
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) |