From eee90e7bb5cb01bbdb9f0b77fea7c8ddb5c06a3d Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 4 May 2019 14:24:42 +0200 Subject: images: install the xserver depending on distro features This is a follow-up to: e1026cf43 images: do not explicitely install ${XSERVER} Signed-off-by: Max Krummenacher --- recipes-images/images/console-tdx-image.bb | 12 +++++++----- recipes-images/images/lxde-image.bb | 6 ++++++ recipes-images/images/lxqt-image.bb | 6 ++++++ recipes-images/images/qt-x11-image.bb | 6 ++++++ recipes-images/images/qt5-x11-image.bb | 6 ++++++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb index 594f0dc..d629600 100644 --- a/recipes-images/images/console-tdx-image.bb +++ b/recipes-images/images/console-tdx-image.bb @@ -18,6 +18,12 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" +IMAGE_FEATURES += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" + IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' @@ -27,11 +33,6 @@ ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", " CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" -#deploy the X server for the tegras -#this adds a few MB to the image, but all graphical HW acceleration is -#available only on top of X, this is not required for nouveau based build. -IMAGE_INSTALL_append_tegra124 = " ${XSERVER} xterm xclock" - IMAGE_INSTALL += " \ packagegroup-boot \ packagegroup-basic \ @@ -40,6 +41,7 @@ IMAGE_INSTALL += " \ ${ROOTFS_PKGMANAGE_PKGS} \ timestamp-service \ packagegroup-base-extended \ + ${bb.utils.contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \ " require recipes-images/images/tdx-extra.inc diff --git a/recipes-images/images/lxde-image.bb b/recipes-images/images/lxde-image.bb index e22e94f..840d650 100644 --- a/recipes-images/images/lxde-image.bb +++ b/recipes-images/images/lxde-image.bb @@ -18,6 +18,12 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" +IMAGE_FEATURES += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" + IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' diff --git a/recipes-images/images/lxqt-image.bb b/recipes-images/images/lxqt-image.bb index 09bf570..b550f6e 100644 --- a/recipes-images/images/lxqt-image.bb +++ b/recipes-images/images/lxqt-image.bb @@ -18,6 +18,12 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" +IMAGE_FEATURES += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" + inherit populate_sdk populate_sdk_qt5 IMAGE_LINGUAS = "en-us" diff --git a/recipes-images/images/qt-x11-image.bb b/recipes-images/images/qt-x11-image.bb index 0a81904..a3d0584 100644 --- a/recipes-images/images/qt-x11-image.bb +++ b/recipes-images/images/qt-x11-image.bb @@ -18,6 +18,12 @@ IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" SYSTEMD_DEFAULT_TARGET = "graphical.target" +IMAGE_FEATURES += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" + IMAGE_LINGUAS = "en-us" #IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb index 18ba3b7..a83da7f 100644 --- a/recipes-images/images/qt5-x11-image.bb +++ b/recipes-images/images/qt5-x11-image.bb @@ -21,6 +21,12 @@ IMAGE_NAME_colibri-imx7-emmc = "Colibri-iMX7-eMMC_${IMAGE_BASENAME}" IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" +IMAGE_FEATURES += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + '', d), d)} \ +" + SYSTEMD_DEFAULT_TARGET = "graphical.target" inherit populate_sdk populate_sdk_qt5 -- cgit v1.2.3