diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-26 10:53:19 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-28 08:57:55 +0000 |
commit | 1041d4df0e6f1610f2037c31051cda4d37e012e6 (patch) | |
tree | 65122f5c1432b649e734cd847d3e52975e08d937 /meta-boot2qt-distro/conf | |
parent | aa863717a1e24a3c08a94726e95493780ccff1f3 (diff) | |
download | meta-boot2qt-1041d4df0e6f1610f2037c31051cda4d37e012e6.tar.gz |
vulkan: remove vulkan from DISTRO_FEATURES for non-gpu boards
Change-Id: I470d84544835ccdf8c01a21685110c751a2e526e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/conf')
6 files changed, 8 insertions, 8 deletions
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 += " \ | |||
44 | PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy" | 44 | PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy" |
45 | PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy" | 45 | PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy" |
46 | 46 | ||
47 | DISTRO_FEATURES_remove = "webengine wayland" | 47 | DISTRO_FEATURES_remove = "webengine wayland vulkan" |
48 | 48 | ||
49 | # try to limit the maximum size of the tezi image | 49 | # try to limit the maximum size of the tezi image |
50 | RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" | 50 | 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 += " \ | |||
44 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | 44 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" |
45 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | 45 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" |
46 | 46 | ||
47 | DISTRO_FEATURES_remove = "webengine wayland" | 47 | DISTRO_FEATURES_remove = "webengine wayland vulkan" |
48 | 48 | ||
49 | # try to limit the maximum size of the tezi image | 49 | # try to limit the maximum size of the tezi image |
50 | RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" | 50 | 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 += " \ | |||
40 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | 40 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" |
41 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | 41 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" |
42 | 42 | ||
43 | DISTRO_FEATURES_remove = "webengine wayland" | 43 | 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 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -43,7 +43,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client" | |||
43 | 43 | ||
44 | KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf" | 44 | KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf" |
45 | 45 | ||
46 | DISTRO_FEATURES_remove = "webengine opengl wayland" | 46 | DISTRO_FEATURES_remove = "webengine opengl wayland vulkan" |
47 | 47 | ||
48 | MACHINE_EXTRA_INSTALL += "\ | 48 | MACHINE_EXTRA_INSTALL += "\ |
49 | mount-vboxsf \ | 49 | 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 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -34,6 +34,6 @@ DEPLOY_CONF_NAME = "i.MX7S WaRP" | |||
34 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | 34 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" |
35 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | 35 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" |
36 | 36 | ||
37 | DISTRO_FEATURES_remove = "webengine wayland" | 37 | DISTRO_FEATURES_remove = "webengine wayland vulkan" |
38 | 38 | ||
39 | KERNEL_DEVICETREE = "imx7d-warp.dtb" | 39 | 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" | |||
34 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" | 34 | PREFERRED_PROVIDER_virtual/egl = "opengldummy" |
35 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" | 35 | PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" |
36 | 36 | ||
37 | DISTRO_FEATURES_remove = "webengine wayland" | 37 | DISTRO_FEATURES_remove = "webengine wayland vulkan" |
38 | 38 | ||