From dda450f9e0ad0a5b41a64ab21d58cb74e3abf71c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 10 Nov 2022 16:26:43 +0100 Subject: local.conf: Select a sane default as DISTRO Toradex Modules based on i.MX 6/6ULL/7 are only supported with the tdx-xwayland-upstream DISTRO, select it as default in local.conf. Related-to: ELB-4716 Signed-off-by: Max Krummenacher (cherry picked from commit 382211f6e51a72996831949002c8c418f0f55636) plus squashed (cherry picked from commit 373359bb690ec623b1a167f30c10a9d398c9704a) --- buildconf/local.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildconf/local.conf b/buildconf/local.conf index 630885c..17cc8ca 100644 --- a/buildconf/local.conf +++ b/buildconf/local.conf @@ -293,8 +293,10 @@ INHERIT += "rm_work" # Add Toradex bbclasses INHERIT += "toradex-mirrors toradex-sanity" -# Use this distro by default -DISTRO ?= "tdx-xwayland" +# 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') 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