diff options
Diffstat (limited to 'recipes-images/images/tdx-reference-multimedia-image.bb')
| -rw-r--r-- | recipes-images/images/tdx-reference-multimedia-image.bb | 13 |
1 files changed, 2 insertions, 11 deletions
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 \ |