diff options
| author | Enrico Jörns <ejo@pengutronix.de> | 2023-04-26 11:37:12 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-05-30 04:11:15 -1000 |
| commit | 1ba75c259c125d148dae20cb938eebe08b75551e (patch) | |
| tree | e3a02bdada8a6b57a3945d4ba611558ef0baeb46 /meta/lib | |
| parent | c6d6808e728d10fa1118723c285adb93269d7197 (diff) | |
| download | poky-1ba75c259c125d148dae20cb938eebe08b75551e.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: 4766ba017b7562e42b33fde7f2e84c2a339e3f4c)
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>
Diffstat (limited to 'meta/lib')
| -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 9f60f3abcc..fd61340087 100644 --- a/meta/lib/oe/package_manager/ipk/__init__.py +++ b/meta/lib/oe/package_manager/ipk/__init__.py | |||
| @@ -245,7 +245,7 @@ class OpkgPM(OpkgDpkgPM): | |||
| 245 | """ | 245 | """ |
| 246 | if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "": | 246 | if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "": |
| 247 | for arch in self.pkg_archs.split(): | 247 | for arch in self.pkg_archs.split(): |
| 248 | cfg_file_name = os.path.join(self.target_rootfs, | 248 | cfg_file_name = oe.path.join(self.target_rootfs, |
| 249 | self.d.getVar("sysconfdir"), | 249 | self.d.getVar("sysconfdir"), |
| 250 | "opkg", | 250 | "opkg", |
| 251 | "local-%s-feed.conf" % arch) | 251 | "local-%s-feed.conf" % arch) |
