From 1041d4df0e6f1610f2037c31051cda4d37e012e6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Sep 2018 10:53:19 +0300 Subject: vulkan: remove vulkan from DISTRO_FEATURES for non-gpu boards Change-Id: I470d84544835ccdf8c01a21685110c751a2e526e Reviewed-by: Mikko Gronoff --- meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf | 2 +- meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf | 2 +- meta-boot2qt-distro/conf/distro/include/colibri-vf.conf | 2 +- meta-boot2qt-distro/conf/distro/include/emulator.conf | 4 ++-- meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf | 4 ++-- meta-boot2qt-distro/conf/distro/include/nitrogen7.conf | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-boot2qt-distro') diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf index 9090055..37731fb 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf @@ -44,7 +44,7 @@ BOOT_SCRIPTS += " \ PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy" -DISTRO_FEATURES_remove = "webengine wayland" +DISTRO_FEATURES_remove = "webengine wayland vulkan" # try to limit the maximum size of the tezi image RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf index a5695f7..1c3889f 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf @@ -44,7 +44,7 @@ BOOT_SCRIPTS += " \ PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" -DISTRO_FEATURES_remove = "webengine wayland" +DISTRO_FEATURES_remove = "webengine wayland vulkan" # try to limit the maximum size of the tezi image RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf index e4c025b..829c8ab 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf @@ -40,4 +40,4 @@ BOOT_SCRIPTS += " \ PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" -DISTRO_FEATURES_remove = "webengine wayland" +DISTRO_FEATURES_remove = "webengine wayland vulkan" diff --git a/meta-boot2qt-distro/conf/distro/include/emulator.conf b/meta-boot2qt-distro/conf/distro/include/emulator.conf index b6125ae..2c70783 100644 --- a/meta-boot2qt-distro/conf/distro/include/emulator.conf +++ b/meta-boot2qt-distro/conf/distro/include/emulator.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -43,7 +43,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client" KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf" -DISTRO_FEATURES_remove = "webengine opengl wayland" +DISTRO_FEATURES_remove = "webengine opengl wayland vulkan" MACHINE_EXTRA_INSTALL += "\ mount-vboxsf \ diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf index 1d30445..eb40035 100644 --- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf +++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,6 +34,6 @@ DEPLOY_CONF_NAME = "i.MX7S WaRP" PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" -DISTRO_FEATURES_remove = "webengine wayland" +DISTRO_FEATURES_remove = "webengine wayland vulkan" KERNEL_DEVICETREE = "imx7d-warp.dtb" diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf index 1614b04..0d225fa 100644 --- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf +++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf @@ -34,5 +34,5 @@ DEPLOY_CONF_NAME = "Boundary Devices i.MX7" PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" -DISTRO_FEATURES_remove = "webengine wayland" +DISTRO_FEATURES_remove = "webengine wayland vulkan" -- cgit v1.2.3-54-g00ecf