diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-10-26 11:37:38 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-01 10:05:45 +0000 |
commit | a1668c8721709f3d1bc0078737514111e1985bdd (patch) | |
tree | 8c9324a2f17f5c92dd74e89620752f2cf2b1fad3 /meta/conf/machine | |
parent | 95502c3a58d6441f1ac9417186dee1c4e13f3abc (diff) | |
download | poky-a1668c8721709f3d1bc0078737514111e1985bdd.tar.gz |
conf: Use xf86-input-libinput by default
Don't install legacy X input drivers for any machines by default,
RRECOMMEND xf86-input-libinput instead.
This is the setup suggested by upstream: install only libinput by
default, but let niche legacy drivers sort higher in configuration
so they get chosen if installed. So the order is:
evdev < libinput < (synaptics|vmmouse|...)
This also removes vmmouse X driver from the qemu config. If a VMware
virtual mouse device really needs to be supported, we should enable
CONFIG_MOUSE_PS2_VMMOUSE in kernel instead: that is directly supported
by the libinput X driver.
Fixes [YOCTO #10195].
(From OE-Core rev: 2d005faff6341a81a2afae28860101ba9db51ae8)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 4 | ||||
-rw-r--r-- | meta/conf/machine/include/x86-base.inc | 4 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 3 |
4 files changed, 1 insertions, 13 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 2bc4dc2db6..0e4103bad7 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
@@ -6,10 +6,8 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | |||
6 | 6 | ||
7 | XSERVER ?= "xserver-xorg \ | 7 | XSERVER ?= "xserver-xorg \ |
8 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ | 8 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ |
9 | xf86-input-evdev \ | ||
10 | xf86-input-mouse \ | ||
11 | xf86-video-fbdev \ | 9 | xf86-video-fbdev \ |
12 | xf86-input-keyboard" | 10 | " |
13 | 11 | ||
14 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen" | 12 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen" |
15 | 13 | ||
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index 479e89e548..40d59577fd 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc | |||
@@ -26,10 +26,6 @@ PREFERRED_VERSION_linux-yocto ??= "4.8%" | |||
26 | # XSERVER subcomponents, used to build the XSERVER variable | 26 | # XSERVER subcomponents, used to build the XSERVER variable |
27 | # | 27 | # |
28 | XSERVER_X86_BASE = "xserver-xorg \ | 28 | XSERVER_X86_BASE = "xserver-xorg \ |
29 | xf86-input-mouse \ | ||
30 | xf86-input-keyboard \ | ||
31 | xf86-input-evdev \ | ||
32 | xf86-input-synaptics \ | ||
33 | " | 29 | " |
34 | 30 | ||
35 | XSERVER_X86_EXT = " \ | 31 | XSERVER_X86_EXT = " \ |
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index b191ddd3cb..f2b2aebf95 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -18,9 +18,6 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | |||
18 | 18 | ||
19 | XSERVER = "xserver-xorg \ | 19 | XSERVER = "xserver-xorg \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ | 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ |
21 | xf86-input-vmmouse \ | ||
22 | xf86-input-keyboard \ | ||
23 | xf86-input-evdev \ | ||
24 | xf86-video-cirrus \ | 21 | xf86-video-cirrus \ |
25 | xf86-video-fbdev \ | 22 | xf86-video-fbdev \ |
26 | xf86-video-vmware \ | 23 | xf86-video-vmware \ |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 8555fd6bfe..09555ad548 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -17,9 +17,6 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | |||
17 | 17 | ||
18 | XSERVER = "xserver-xorg \ | 18 | XSERVER = "xserver-xorg \ |
19 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ | 19 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ |
20 | xf86-input-vmmouse \ | ||
21 | xf86-input-keyboard \ | ||
22 | xf86-input-evdev \ | ||
23 | xf86-video-cirrus \ | 20 | xf86-video-cirrus \ |
24 | xf86-video-fbdev \ | 21 | xf86-video-fbdev \ |
25 | xf86-video-vmware \ | 22 | xf86-video-vmware \ |