1 files changed, 42 insertions, 74 deletions
diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb
index a815fb0..6fdb6d7 100644
--- a/recipes-images/images/packagegroup-tdx-graphical.bb
+++ b/recipes-images/images/packagegroup-tdx-graphical.bb
@@ -9,77 +9,78 @@ PACKAGES += " \
     packagegroup-drm-utils-tdx-graphical \
     packagegroup-gstreamer-tdx-graphical \
     packagegroup-gpu-tdx-graphical \
-    packagegroup-x11-components-tdx-graphical \
-    packagegroup-x11-utils-tdx-graphical \
+    packagegroup-vulkan-tools-tdx-graphical \
 "
 
-RRECOMMENDS_packagegroup-tdx-graphical = " \
+RRECOMMENDS:packagegroup-tdx-graphical = " \
     packagegroup-gstreamer-tdx-graphical \
     packagegroup-gpu-tdx-graphical \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
-       bb.utils.contains('DISTRO_FEATURES', 'x11', \
-                         'packagegroup-x11-components-tdx-graphical \
-                          packagegroup-x11-utils-tdx-graphical', \
-                         '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', \
+                         'packagegroup-vulkan-tools-tdx-graphical', '', d)} \
 "
-RRECOMMENDS_packagegroup-tdx-graphical_append_mx8 = " \
+RRECOMMENDS:packagegroup-tdx-graphical:append:k3 = " \
     packagegroup-drm-utils-tdx-graphical \
 "
-RRECOMMENDS_packagegroup-tdx-graphical_append_tegra124m = " \
+RRECOMMENDS:packagegroup-tdx-graphical:append:mx8-nxp-bsp = " \
+    packagegroup-drm-utils-tdx-graphical \
+"
+RRECOMMENDS:packagegroup-tdx-graphical:append:upstream = " \
     packagegroup-drm-utils-tdx-graphical \
 "
 
-SUMMARY_packagegroup-drm-utils-tdx-graphical = "Utilities for DRM, Direct Rendering Manager"
-RRECOMMENDS_packagegroup-drm-utils-tdx-graphical = " \
+SUMMARY:packagegroup-drm-utils-tdx-graphical = "Utilities for DRM, Direct Rendering Manager"
+RRECOMMENDS:packagegroup-drm-utils-tdx-graphical = " \
     libdrm-tests \
 "
 
-SUMMARY_packagegroup-gstreamer-tdx-graphical = "gstreamer packages"
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical = "\
+SUMMARY:packagegroup-gstreamer-tdx-graphical = "gstreamer packages"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical = " \
     gstreamer1.0 \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \
+    gst-examples \
 "
 GSTREAMER_MX6QDL = " \
     gstreamer1.0-plugins-base-ximagesink \
     gstreamer1.0-plugins-imx \
+    imx-gst1.0-plugin \
+    imx-gst1.0-plugin-gplay \
+    imx-gst1.0-plugin-grecorder \
 "
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6dl = " ${GSTREAMER_MX6QDL}"
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6q = " ${GSTREAMER_MX6QDL}"
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_colibri-imx6ull = ""
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx7 = " imx-gst1.0-plugin"
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx8 = " \
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl-nxp-bsp = " ${GSTREAMER_MX6QDL}"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q-nxp-bsp = " ${GSTREAMER_MX6QDL}"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull = ""
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = ""
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7-nxp-bsp = " imx-gst1.0-plugin"
+RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8-nxp-bsp = " \
     imx-gst1.0-plugin \
     imx-gst1.0-plugin-gplay \
     imx-gst1.0-plugin-grecorder \
     packagegroup-fsl-gstreamer1.0-full \
-    gst-examples \
-"
-RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_tegra124 = " \
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \
-    libgstcodecparsers-1.0 \
-    libgstomx-1.0 \
 "
 
-SUMMARY_packagegroup-gpu-utils-tdx-graphical = "Utilities for GPU (OpenGL...)"
+SUMMARY:packagegroup-gpu-utils-tdx-graphical = "Utilities for GPU (OpenGL...)"
 IMAGE_INSTALL_OPENCL_IMX = " \
     clpeak \
     libopencl-imx \
 "
-RRECOMMENDS_packagegroup-gpu-tdx-graphical = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical = " \
     glmark2 \
 "
-IMAGE_INSTALL_MX6QDL = " \
+IMAGE_INSTALL_GPU_MX6QDL = " \
     packagegroup-fsl-gpu-libs \
 "
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6dl = " ${IMAGE_INSTALL_MX6QDL}"
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6q = " \
-    ${IMAGE_INSTALL_MX6QDL} \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6dl-nxp-bsp = " \
+    ${IMAGE_INSTALL_GPU_MX6QDL} \
+"
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q-nxp-bsp = " \
+    ${IMAGE_INSTALL_GPU_MX6QDL} \
     ${IMAGE_INSTALL_OPENCL_IMX} \
 "
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_mx6ull = ""
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8 = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull = ""
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = ""
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8-nxp-bsp = " \
     tinycompress \
     libvdk-imx \
     vulkan-headers \
@@ -87,50 +88,17 @@ RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8 = " \
     vulkan-tools \
     ${IMAGE_INSTALL_OPENCL_IMX} \
 "
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_remove_mx8mm = " \
-    vulkan \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm-nxp-bsp = " \
+    vulkan-headers \
+    vulkan-loader \
+    vulkan-tools \
     ${IMAGE_INSTALL_OPENCL_IMX} \
 "
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8qm = " \
+RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm-nxp-bsp = " \
     libopenvx-imx \
 "
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_tegra124 = " \
-    libglu \
-    freeglut \
-    tiff \
-    xvinfo \
-"
-RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_tegra124m = " \
-    libglu \
-    freeglut \
-    tiff \
-    xvinfo \
-"
-
-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', \
-       '', d), d)} \
+SUMMARY:packagegroup-vulkan-tools-tdx-graphical = "Vulkan tools"
+RRECOMMENDS:packagegroup-vulkan-tools-tdx-graphical = " \
+    vulkan-tools \
 "