images: drop considering x11 as the graphical backend

They X11 distros are unmaintained for a while now. Likely built
images will not run if they even build.
Remove adding X11 packages.

Related-to: ELB-5740
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

2 files changed, 2 insertions, 46 deletions

diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb
index 3ecb648..6fdb6d7 100644
--- a/recipes-images/images/packagegroup-tdx-graphical.bb
+++ b/recipes-images/images/packagegroup-tdx-graphical.bb
@@ -10,8 +10,6 @@ PACKAGES += " \
     packagegroup-gstreamer-tdx-graphical \
     packagegroup-gpu-tdx-graphical \
     packagegroup-vulkan-tools-tdx-graphical \
-    packagegroup-x11-components-tdx-graphical \
-    packagegroup-x11-utils-tdx-graphical \
 "
 
 RRECOMMENDS:packagegroup-tdx-graphical = " \
@@ -19,11 +17,6 @@ RRECOMMENDS:packagegroup-tdx-graphical = " \
     packagegroup-gpu-tdx-graphical \
     ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', \
                          'packagegroup-vulkan-tools-tdx-graphical', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
-       bb.utils.contains('DISTRO_FEATURES', 'x11', \
-                         'packagegroup-x11-components-tdx-graphical \
-                          packagegroup-x11-utils-tdx-graphical', \
-                         '', d), d)} \
 "
 RRECOMMENDS:packagegroup-tdx-graphical:append:k3 = " \
     packagegroup-drm-utils-tdx-graphical \
@@ -109,31 +102,3 @@ SUMMARY:packagegroup-vulkan-tools-tdx-graphical = "Vulkan tools"
 RRECOMMENDS:packagegroup-vulkan-tools-tdx-graphical = " \
     vulkan-tools \
 "
-
-SUMMARY:packagegroup-x11-components-tdx-graphical = "Components of X11"
-RRECOMMENDS:packagegroup-x11-components-tdx-graphical = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
-       bb.utils.contains('DISTRO_FEATURES', 'x11', \
-       'libxcursor \
-        libxdamage \
-        libxres \
-        libxvmc \
-        xcursor-transparent-theme \
-        xorg-minimal-fonts \
-        xrdb \
-        xserver-xorg-extension-dbe \
-        xserver-xorg-extension-extmod \
-        xserver-xorg-multimedia-modules \
-        xserver-xorg-utils', \
-       '', d), d)} \
-"
-
-SUMMARY:packagegroup-x11-utils-tdx-graphical = "Utilities for X11"
-RRECOMMENDS:packagegroup-x11-utils-tdx-graphical = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
-       bb.utils.contains('DISTRO_FEATURES', 'x11', \
-       'scrot \
-        setxkbmap \
-        unclutter-xfixes', \
-       '', d), d)} \
-"
diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb
index 4299e81..bd7b43c 100644
--- a/recipes-images/images/tdx-reference-multimedia-image.bb
+++ b/recipes-images/images/tdx-reference-multimedia-image.bb
@@ -9,8 +9,7 @@ inherit populate_sdk_qt5
 export IMAGE_BASENAME = "Reference-Multimedia-Image"
 
 IMAGE_FEATURES += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \
-       bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', '', d)} \
 "
 
 APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience"
@@ -20,19 +19,11 @@ APP_LAUNCH_WAYLAND:colibri-imx7 ?= "wayland-qtdemo-launch-analogclock"
 APP_LAUNCH_WAYLAND:colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock"
 APP_LAUNCH_WAYLAND:verdin-am62 ?= "wayland-qtdemo-launch-analogclock"
 
-APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience"
-APP_LAUNCH_X11:colibri-imx6ull ?= "x-window-analogclock"
-APP_LAUNCH_X11:colibri-imx6ull-emmc ?= "x-window-analogclock"
-APP_LAUNCH_X11:colibri-imx7 ?= "x-window-analogclock"
-APP_LAUNCH_X11:colibri-imx7-emmc ?= "x-window-analogclock"
-APP_LAUNCH_X11:verdin-am62 ?= "x-window-analogclock"
-
 IMAGE_INSTALL += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
                          '${APP_LAUNCH_WAYLAND}', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \
-                         'weston-xwayland xterm', \
-       bb.utils.contains('DISTRO_FEATURES', 'x11', '${APP_LAUNCH_X11}', '', d), d)} \
+                         'weston-xwayland xterm', '', d)} \
     ${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "packagegroup-tpm2-tdx-cli", "",d)} \
     \
     packagegroup-tdx-cli \