From d1e9b52fd4c05c92c5e5756093c48faa1d609b58 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Wed, 15 Jul 2020 12:17:01 +0200 Subject: images: delete graphical-tdx-image Related-to: ELB-2838 Signed-off-by: Philippe Schenker --- recipes-images/images/graphical-tdx-image.bb | 23 ---------------------- .../images/tdx-reference-multimedia-image.bb | 16 ++++++++++++++- 2 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 recipes-images/images/graphical-tdx-image.bb diff --git a/recipes-images/images/graphical-tdx-image.bb b/recipes-images/images/graphical-tdx-image.bb deleted file mode 100644 index 169b05b..0000000 --- a/recipes-images/images/graphical-tdx-image.bb +++ /dev/null @@ -1,23 +0,0 @@ -require tdx-reference-minimal-image.bb - -SUMMARY = "Toradex Embedded Linux Graphical Image" -DESCRIPTION = "Image with a graphical interface, either using weston or X11" - -#Prefix to the resulting deployable tarball name -export IMAGE_BASENAME = "Graphical-Image" - -SYSTEMD_DEFAULT_TARGET = "graphical.target" - -IMAGE_FEATURES += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ - '', d), d)} \ -" - -IMAGE_INSTALL += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ - 'weston weston-init weston-examples wayland-terminal-launch', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ - 'weston-xwayland xterm', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x-window-xterm', '', d), d)} \ -" diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index 968b5c9..7dd6db4 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -1,4 +1,4 @@ -require graphical-tdx-image.bb +require tdx-reference-minimal-image.bb SUMMARY = "Toradex Embedded Linux Reference Multimedia Image" DESCRIPTION = "Image for BSP verification with QT and multimedia features" @@ -6,7 +6,21 @@ DESCRIPTION = "Image for BSP verification with QT and multimedia features" #Prefix to the resulting deployable tarball name export IMAGE_BASENAME = "Reference-Multimedia-Image" +SYSTEMD_DEFAULT_TARGET = "graphical.target" + +IMAGE_FEATURES += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" + IMAGE_INSTALL += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ + 'weston weston-init weston-examples wayland-terminal-launch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ + 'weston-xwayland xterm', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x-window-xterm', '', d), d)} \ + \ packagegroup-tdx-cli \ packagegroup-tdx-graphical \ \ -- cgit v1.2.3