summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-01-12 16:39:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:08 +0000
commitf1b5f85e58a2231601f8c0583c277d2e6232b94e (patch)
tree4def497650da2d66114aaf05dfd4c47d24e8d8d0 /meta/recipes-core
parent3967b0a7e3d248ff3b3c6b512c6ae9eaf84b9b8a (diff)
downloadpoky-f1b5f85e58a2231601f8c0583c277d2e6232b94e.tar.gz
glib-2.0: Fix hardcoded paths with dots in names
b4087338be09 ("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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
index 5e71c81cca..e4cf50d22f 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
@@ -36,7 +36,7 @@ def find_meson_cross_files(d):
36 files = collections.OrderedDict() 36 files = collections.OrderedDict()
37 for path in d.getVar("FILESPATH").split(":"): 37 for path in d.getVar("FILESPATH").split(":"):
38 for element in sitedata: 38 for element in sitedata:
39 filename = os.path.join(path, "meson.cross.d", element) 39 filename = os.path.normpath(os.path.join(path, "meson.cross.d", element))
40 files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename) 40 files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename)
41 41
42 items = ["--cross-file=" + k for k,v in files.items() if v] 42 items = ["--cross-file=" + k for k,v in files.items() if v]