glib-2.0: Fix hardcoded paths with dots in names

b4087338be ("glib-2.0: Fix hardcoded paths in checksums") fixed
embedded paths in task hashes, but if these paths included dots then
these were flattened when COREBASE was computed. Fix this by resolving
our filenames before replacing the path segments with COREBASE.

(From OE-Core rev: 05c514bfdd0f3201f6a516c9dc93dff0592e23db)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
2020-01-12 16:39:47 +00:00
committed by Richard Purdie
parent 3967b0a7e3
commit f1b5f85e58

View File

@@ -36,7 +36,7 @@ def find_meson_cross_files(d):
files = collections.OrderedDict()
for path in d.getVar("FILESPATH").split(":"):
for element in sitedata:
filename = os.path.join(path, "meson.cross.d", element)
filename = os.path.normpath(os.path.join(path, "meson.cross.d", element))
files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename)
items = ["--cross-file=" + k for k,v in files.items() if v]