From 9852a5caf52fd8bb833bee05a47cfe111ed5b662 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 5 Mar 2021 22:04:25 +0100 Subject: glib-2.0: show an error about --cross-file only when such file exists (From OE-Core rev: 6bd44129a76bdae1320f76035b23568a9c2b4e57) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb index a2fa5345b4..4176dbd207 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb @@ -41,7 +41,8 @@ def find_meson_cross_files(d): filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) sanitized_path = filename.replace(thisdir, "${THISDIR}") if sanitized_path == filename: - bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) + if os.path.exists(filename): + bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) continue files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) -- cgit v1.2.3-54-g00ecf