diff options
| author |   Enrico Jörns <ejo@pengutronix.de> | 2023-04-26 11:37:12 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-05-15 05:46:54 -1000 |
| commit | 116e2b1d0c75c6be333339812468550145915774 (patch) | |
| tree | b6ae8a357579f65d574daab5347b1e5abe59b864 | |
| parent | cf31424aa7ce3308373899181aef0e503ead4776 (diff) | |
| download | openembedded-core-116e2b1d0c75c6be333339812468550145915774.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.
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__.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): """ if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "": for arch in self.pkg_archs.split(): - cfg_file_name = os.path.join(self.target_rootfs, + cfg_file_name = oe.path.join(self.target_rootfs, self.d.getVar("sysconfdir"), "opkg", "local-%s-feed.conf" % arch) |