From aafc083408d1891edb575ec19157c1c44a2d9a54 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 28 Mar 2022 16:50:19 +0200 Subject: tdx-reference-multimedia-image: use weston image feature There is now a 'weston' image feature introduced in OE, we can use it to install weston related packages and choose SYSTEMD_DEFAULT_TARGET. Also change to use "x11-base" image feature instead of "x11", this ensures x11 init scripts would be installed to image. Related-to: ELB-3477 Signed-off-by: Ming Liu --- recipes-images/images/tdx-reference-multimedia-image.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index f96528b..66e950b 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -8,12 +8,9 @@ inherit populate_sdk_qt5 #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)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d), d)} \ " APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience" @@ -32,7 +29,7 @@ APP_LAUNCH_X11:apalis-tk1 ?= "x-window-qtsmarthome" IMAGE_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ - 'weston weston-init weston-examples ${APP_LAUNCH_WAYLAND}', '', d)} \ + '${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)} \ -- cgit v1.2.3