From 9a93acdeda3fed168b74c33788f385ac42702ed4 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 17 Apr 2020 17:29:46 +0200 Subject: meta: avoid overridding DISTROOVERRIDES 'DISTRO' is in DISTROOVERRIDES by default, we should not use "=" to override that when adding 'tdx' to DISTROOVERRIDES, use ".=" to append to it. With the above change, we do not need to append 'tdx-x11' and 'tdx-xwayland' to DISTROOVERRIDES, drop them. Signed-off-by: Ming Liu --- conf/distro/include/tdx-base.inc | 2 +- conf/distro/tdx-x11.conf | 1 - conf/distro/tdx-xwayland.conf | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index 2800ac2..f8e5dfc 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -39,7 +39,7 @@ MAINTAINER = "Toradex " TARGET_VENDOR = "-tdx" -DISTROOVERRIDES = "tdx" +DISTROOVERRIDES .= ":tdx" # create etc/build in the rootfs INHERIT += "image-buildinfo" diff --git a/conf/distro/tdx-x11.conf b/conf/distro/tdx-x11.conf index c809571..37ae401 100644 --- a/conf/distro/tdx-x11.conf +++ b/conf/distro/tdx-x11.conf @@ -5,7 +5,6 @@ require conf/distro/include/tdx-base.inc DISTRO = "tdx-x11" DISTRO_NAME = "TDX X11" -DISTROOVERRIDES .= ":tdx-x11" DISTRO_FLAVOUR = "" # Remove conflicting backends. diff --git a/conf/distro/tdx-xwayland.conf b/conf/distro/tdx-xwayland.conf index fa11461..40bdda3 100644 --- a/conf/distro/tdx-xwayland.conf +++ b/conf/distro/tdx-xwayland.conf @@ -5,7 +5,6 @@ require conf/distro/include/tdx-base.inc DISTRO = "tdx-xwayland" DISTRO_NAME = "TDX Wayland with XWayland" -DISTROOVERRIDES .= ":tdx-wayland" DISTRO_FLAVOUR = "" # we use graphics, so set opengl -- cgit v1.2.3