From b4087338be0955a8d82a835aecc5ad50dfa96f64 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 Jan 2020 17:56:16 +0000 Subject: 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 --- meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/glib-2.0') 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 953fba501a..5e71c81cca 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 @@ -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)) -- cgit v1.2.3-54-g00ecf