]> code.ossystems Code Review - openembedded-core.git/commitdiff
glib-2.0: call os.path.normpath on THISDIR
authorMartin Jansa <Martin.Jansa@gmail.com>
Tue, 2 Mar 2021 19:32:29 +0000 (20:32 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 6 Mar 2021 22:36:34 +0000 (22:36 +0000)
* some build environments have relative paths in THISDIR, e.g. from OEROOT set in:
  https://github.com/96boards/oe-rpb-manifest/blob/1e3345c26c56f77f3a15a3978f412a25955d2606/conf/bblayers.conf#L4
  and then the paths in filename normalized in:
  filename = os.path.normpath(os.path.join(path, meson.cross.d, element))
  don't match.

* COREBASE used here before didn't have this issue because the value is already
  normalized when set in:
  meta/conf/layer.conf:COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb

index 882a89da7a87f9b5125e732c9cf2ee014a1f32aa..a2fa5345b44a438b877fa71536c875afda550727 100644 (file)
@@ -31,7 +31,7 @@ def find_meson_cross_files(d):
     if bb.data.inherits_class('native', d):
         return ""
 
-    thisdir = d.getVar("THISDIR")
+    thisdir = os.path.normpath(d.getVar("THISDIR"))
     import collections
     sitedata = siteinfo_data(d)
     # filename -> found