diff options
Diffstat (limited to 'meta/conf/machine/include')
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/x86-base.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 591f6b4a62..a5fc88aa01 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
| @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | |||
| 5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
| 6 | 6 | ||
| 7 | XSERVER ?= "xserver-xorg \ | 7 | XSERVER ?= "xserver-xorg \ |
| 8 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ | 8 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ |
| 9 | xf86-input-evdev \ | 9 | xf86-input-evdev \ |
| 10 | xf86-input-mouse \ | 10 | xf86-input-mouse \ |
| 11 | xf86-video-fbdev \ | 11 | xf86-video-fbdev \ |
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index d6c4d6010f..f7c8a45fa7 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc | |||
| @@ -33,16 +33,16 @@ XSERVER_X86_BASE = "xserver-xorg \ | |||
| 33 | " | 33 | " |
| 34 | 34 | ||
| 35 | XSERVER_X86_EXT = " \ | 35 | XSERVER_X86_EXT = " \ |
| 36 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ | 36 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ |
| 37 | xserver-xorg-module-libint10 \ | 37 | xserver-xorg-module-libint10 \ |
| 38 | " | 38 | " |
| 39 | 39 | ||
| 40 | XSERVER_X86_I915 = "xf86-video-intel \ | 40 | XSERVER_X86_I915 = "xf86-video-intel \ |
| 41 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ | 41 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ |
| 42 | " | 42 | " |
| 43 | 43 | ||
| 44 | XSERVER_X86_I965 = "xf86-video-intel \ | 44 | XSERVER_X86_I965 = "xf86-video-intel \ |
| 45 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ |
| 46 | " | 46 | " |
| 47 | 47 | ||
| 48 | XSERVER_X86_VESA = "xf86-video-vesa" | 48 | XSERVER_X86_VESA = "xf86-video-vesa" |
