]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
package_manager/ipk: fix config path generation in _create_custom_config()
authorEnrico Jörns <ejo@pengutronix.de>
Wed, 26 Apr 2023 09:37:12 +0000 (11:37 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 5 May 2023 09:57:08 +0000 (10:57 +0100)
"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>
meta/lib/oe/package_manager/ipk/__init__.py

index caca522fd69766f5f52c951c084d82b58807cd32..e6f9c08e2b68ed2ec56036183c8a4a6c47477d8d 100644 (file)
@@ -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)