summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-09-26 10:53:19 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-09-28 08:57:55 +0000
commit1041d4df0e6f1610f2037c31051cda4d37e012e6 (patch)
tree65122f5c1432b649e734cd847d3e52975e08d937
parentaa863717a1e24a3c08a94726e95493780ccff1f3 (diff)
downloadmeta-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>
-rw-r--r--meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf2
-rw-r--r--meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf2
-rw-r--r--meta-boot2qt-distro/conf/distro/include/colibri-vf.conf2
-rw-r--r--meta-boot2qt-distro/conf/distro/include/emulator.conf4
-rw-r--r--meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf4
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen7.conf2
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 += " \
44PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy" 44PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
45PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy" 45PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
46 46
47DISTRO_FEATURES_remove = "webengine wayland" 47DISTRO_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
50RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" 50RDEPENDS_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 += " \
44PREFERRED_PROVIDER_virtual/egl = "opengldummy" 44PREFERRED_PROVIDER_virtual/egl = "opengldummy"
45PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" 45PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
46 46
47DISTRO_FEATURES_remove = "webengine wayland" 47DISTRO_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
50RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" 50RDEPENDS_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 += " \
40PREFERRED_PROVIDER_virtual/egl = "opengldummy" 40PREFERRED_PROVIDER_virtual/egl = "opengldummy"
41PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" 41PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
42 42
43DISTRO_FEATURES_remove = "webengine wayland" 43DISTRO_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
44KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf" 44KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
45 45
46DISTRO_FEATURES_remove = "webengine opengl wayland" 46DISTRO_FEATURES_remove = "webengine opengl wayland vulkan"
47 47
48MACHINE_EXTRA_INSTALL += "\ 48MACHINE_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"
34PREFERRED_PROVIDER_virtual/egl = "opengldummy" 34PREFERRED_PROVIDER_virtual/egl = "opengldummy"
35PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" 35PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
36 36
37DISTRO_FEATURES_remove = "webengine wayland" 37DISTRO_FEATURES_remove = "webengine wayland vulkan"
38 38
39KERNEL_DEVICETREE = "imx7d-warp.dtb" 39KERNEL_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"
34PREFERRED_PROVIDER_virtual/egl = "opengldummy" 34PREFERRED_PROVIDER_virtual/egl = "opengldummy"
35PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" 35PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
36 36
37DISTRO_FEATURES_remove = "webengine wayland" 37DISTRO_FEATURES_remove = "webengine wayland vulkan"
38 38