From 3d8358d0b82b9d49ff50365f331c7b0be8b0c1b9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 26 Oct 2020 13:03:11 +0100 Subject: tdx distros: add x11 to image filename and descriptions So far the graphical backend (X11 / Wayland) did not show in the created image names or the Toradex Easy Installer meta data at all. As we now build by default only Wayland, leave those alone. If one builds for X11 then add this to the file name and the descriptive meta data. Signed-off-by: Max Krummenacher --- conf/distro/tdx-x11-rt.conf | 2 +- conf/distro/tdx-x11-upstream-rt.conf | 2 +- conf/distro/tdx-x11-upstream.conf | 2 +- conf/distro/tdx-x11.conf | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/distro/tdx-x11-rt.conf b/conf/distro/tdx-x11-rt.conf index ec071cf..66669f2 100644 --- a/conf/distro/tdx-x11-rt.conf +++ b/conf/distro/tdx-x11-rt.conf @@ -6,6 +6,6 @@ require conf/distro/tdx-x11.conf DISTRO = "tdx-x11-rt" DISTRO_NAME = "TDX X11 RT" DISTROOVERRIDES .= ":preempt-rt" -DISTRO_FLAVOUR = " (PREEMPT_RT)" +DISTRO_FLAVOUR = " (X11 PREEMPT_RT)" IMAGE_BASENAME_append = "-rt" diff --git a/conf/distro/tdx-x11-upstream-rt.conf b/conf/distro/tdx-x11-upstream-rt.conf index f07a7a8..343534e 100644 --- a/conf/distro/tdx-x11-upstream-rt.conf +++ b/conf/distro/tdx-x11-upstream-rt.conf @@ -6,6 +6,6 @@ require conf/distro/tdx-x11-upstream.conf DISTRO = "tdx-x11-upstream-rt" DISTRO_NAME = "TDX X11 Upstream RT" DISTROOVERRIDES .= ":preempt-rt" -DISTRO_FLAVOUR = " (UPSTREAM PREEMPT_RT)" +DISTRO_FLAVOUR = " (X11 UPSTREAM PREEMPT_RT)" IMAGE_BASENAME_append = "-rt" diff --git a/conf/distro/tdx-x11-upstream.conf b/conf/distro/tdx-x11-upstream.conf index a306590..456dfd2 100644 --- a/conf/distro/tdx-x11-upstream.conf +++ b/conf/distro/tdx-x11-upstream.conf @@ -6,7 +6,7 @@ require conf/distro/tdx-x11.conf DISTRO = "tdx-x11-upstream" DISTRO_NAME = "TDX X11 Upstream" DISTROOVERRIDES .= ":upstream" -DISTRO_FLAVOUR = " (UPSTREAM)" +DISTRO_FLAVOUR = " (X11 UPSTREAM)" IMX_DEFAULT_BSP = "mainline" diff --git a/conf/distro/tdx-x11.conf b/conf/distro/tdx-x11.conf index e0d27f5..a707f39 100644 --- a/conf/distro/tdx-x11.conf +++ b/conf/distro/tdx-x11.conf @@ -5,7 +5,9 @@ require conf/distro/include/tdx-base.inc DISTRO = "tdx-x11" DISTRO_NAME = "TDX X11" -DISTRO_FLAVOUR = "" +DISTRO_FLAVOUR = "(X11)" + +IMAGE_BASENAME_append = "-x11" IMX_DEFAULT_BSP = "nxp" -- cgit v1.2.3