glib-2.0: Fix hardcoded paths in checksums

The expansion by this function, recently added by the meson site handling code
was causing hardcoded paths to become embedded in the tash hashes. Avoid this
(and hence avoid eSDK failures which exposed this).

(From OE-Core rev: 83899aad423cd36cea7ab2ea210feae5b3359823)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-01-10 17:56:16 +00:00
parent e30b8ddad2
commit b4087338be

View File

@@ -29,6 +29,7 @@ def find_meson_cross_files(d):
if bb.data.inherits_class('native', d):
return ""
corebase = d.getVar("COREBASE")
import collections
sitedata = siteinfo_data(d)
# filename -> found
@@ -36,7 +37,7 @@ def find_meson_cross_files(d):
for path in d.getVar("FILESPATH").split(":"):
for element in sitedata:
filename = os.path.join(path, "meson.cross.d", element)
files[filename] = os.path.exists(filename)
files[filename.replace(corebase, "${COREBASE}")] = os.path.exists(filename)
items = ["--cross-file=" + k for k,v in files.items() if v]
d.appendVar("EXTRA_OEMESON", " " + " ".join(items))