From 373359bb690ec623b1a167f30c10a9d398c9704a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 12 Nov 2022 11:06:49 +0100 Subject: local.conf: harden logic which sets distro When no MACHINE is set the inline python errors out. Fix that. That allows the sanity checker to print a self explaining error message. Signed-off-by: Max Krummenacher --- buildconf/local.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconf/local.conf b/buildconf/local.conf index 83c03d3..17cc8ca 100644 --- a/buildconf/local.conf +++ b/buildconf/local.conf @@ -296,7 +296,7 @@ INHERIT += "toradex-mirrors toradex-sanity" # Use the upstream distro for modules based on i.MX 6/6ULL/7, downstream is no longer supported. # For i.MX 8/8X/8MM/8MP the downstream distro is used. MACHINES_UPSTREAM_DISTRO_DEFAULT = "apalis-imx6 colibri-imx6 colibri-imx6ull colibri-imx6ull-emmc colibri-imx7 colibri-imx7-emmc" -DISTRO ?= "${@bb.utils.contains("MACHINES_UPSTREAM_DISTRO_DEFAULT", d.getVar('MACHINE'), "tdx-xwayland-upstream", "tdx-xwayland", d)}" +DISTRO ?= "${@bb.utils.contains("MACHINES_UPSTREAM_DISTRO_DEFAULT", d.getVar('MACHINE') or '', "tdx-xwayland-upstream", "tdx-xwayland", d)}" # Don't generate the mirror tarball for SCM repos, the snapshot is enough # BB_GENERATE_MIRROR_TARBALLS = "0" -- cgit v1.2.3