summaryrefslogtreecommitdiff
path: root/recipes-images
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2020-07-15 12:17:01 +0200
committerPhilippe Schenker <philippe.schenker@toradex.com>2020-07-22 18:21:20 +0200
commitd1e9b52fd4c05c92c5e5756093c48faa1d609b58 (patch)
treee46e8be7dfcff2b05d286c4d572d5437f011585d /recipes-images
parent48f01e2c5d3b9599550a327bd91c662e80cac76f (diff)
images: delete graphical-tdx-image
Related-to: ELB-2838 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'recipes-images')
-rw-r--r--recipes-images/images/graphical-tdx-image.bb23
-rw-r--r--recipes-images/images/tdx-reference-multimedia-image.bb16
2 files changed, 15 insertions, 24 deletions
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 \
\