diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-10-26 11:37:39 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-01 10:05:45 +0000 |
commit | 85d1d268585962b4175e52f0bf9800727ef0a48b (patch) | |
tree | dc32d2058a8d1845937691b5d8d505806587f121 /meta/recipes-graphics/xorg-xserver/xserver-xf86-config | |
parent | a1668c8721709f3d1bc0078737514111e1985bdd (diff) | |
download | poky-85d1d268585962b4175e52f0bf9800727ef0a48b.tar.gz |
xserver-xf86-config: Remove legacy drivers from xorg.conf
Trying to configure evdev and mouse leads to errors in X startup
because xf86-input-libinput is now the default. No configuration
should be needed: xf86-input-libinput should just work out-of-the-box.
(From OE-Core rev: bd1e0b50af7a0b08bb57cc684afaee1ca2a03545)
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/recipes-graphics/xorg-xserver/xserver-xf86-config')
7 files changed, 0 insertions, 217 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf index 629ae214e8..f4cd139e8d 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | 5 | Section "Device" |
34 | Identifier "Graphics Controller" | 6 | Identifier "Graphics Controller" |
35 | Driver "fbdev" | 7 | Driver "fbdev" |
@@ -62,8 +34,5 @@ EndSection | |||
62 | Section "ServerLayout" | 34 | Section "ServerLayout" |
63 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
64 | Screen "Default Screen" | 36 | Screen "Default Screen" |
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
69 | EndSection | 38 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf index e6c8b514e3..1d3c64f620 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | 5 | Section "Device" |
34 | Identifier "Graphics Controller" | 6 | Identifier "Graphics Controller" |
35 | Driver "fbdev" | 7 | Driver "fbdev" |
@@ -63,8 +35,5 @@ EndSection | |||
63 | Section "ServerLayout" | 35 | Section "ServerLayout" |
64 | Identifier "Default Layout" | 36 | Identifier "Default Layout" |
65 | Screen "Default Screen" | 37 | Screen "Default Screen" |
66 | InputDevice "Generic Keyboard" | ||
67 | # InputDevice "Configured Mouse" | ||
68 | InputDevice "QEMU Tablet" | ||
69 | Option "AllowEmptyInput" "no" | 38 | Option "AllowEmptyInput" "no" |
70 | EndSection | 39 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf index 629ae214e8..f4cd139e8d 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | 5 | Section "Device" |
34 | Identifier "Graphics Controller" | 6 | Identifier "Graphics Controller" |
35 | Driver "fbdev" | 7 | Driver "fbdev" |
@@ -62,8 +34,5 @@ EndSection | |||
62 | Section "ServerLayout" | 34 | Section "ServerLayout" |
63 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
64 | Screen "Default Screen" | 36 | Screen "Default Screen" |
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
69 | EndSection | 38 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf index 629ae214e8..f4cd139e8d 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | 5 | Section "Device" |
34 | Identifier "Graphics Controller" | 6 | Identifier "Graphics Controller" |
35 | Driver "fbdev" | 7 | Driver "fbdev" |
@@ -62,8 +34,5 @@ EndSection | |||
62 | Section "ServerLayout" | 34 | Section "ServerLayout" |
63 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
64 | Screen "Default Screen" | 36 | Screen "Default Screen" |
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
69 | EndSection | 38 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf index 629ae214e8..f4cd139e8d 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "mouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Device" | 5 | Section "Device" |
34 | Identifier "Graphics Controller" | 6 | Identifier "Graphics Controller" |
35 | Driver "fbdev" | 7 | Driver "fbdev" |
@@ -62,8 +34,5 @@ EndSection | |||
62 | Section "ServerLayout" | 34 | Section "ServerLayout" |
63 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
64 | Screen "Default Screen" | 36 | Screen "Default Screen" |
65 | InputDevice "Generic Keyboard" | ||
66 | # InputDevice "Configured Mouse" | ||
67 | InputDevice "QEMU Tablet" | ||
68 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
69 | EndSection | 38 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf index bbda9eaa63..c12d92c201 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "vmmouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Monitor" | 5 | Section "Monitor" |
34 | Identifier "Generic Monitor" | 6 | Identifier "Generic Monitor" |
35 | Option "DPMS" | 7 | Option "DPMS" |
@@ -57,8 +29,5 @@ EndSection | |||
57 | Section "ServerLayout" | 29 | Section "ServerLayout" |
58 | Identifier "Default Layout" | 30 | Identifier "Default Layout" |
59 | Screen "Default Screen" | 31 | Screen "Default Screen" |
60 | InputDevice "Generic Keyboard" | ||
61 | # InputDevice "Configured Mouse" | ||
62 | InputDevice "QEMU Tablet" | ||
63 | Option "AllowEmptyInput" "no" | 32 | Option "AllowEmptyInput" "no" |
64 | EndSection | 33 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf index bbda9eaa63..c12d92c201 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | |||
@@ -2,34 +2,6 @@ | |||
2 | Section "Files" | 2 | Section "Files" |
3 | EndSection | 3 | EndSection |
4 | 4 | ||
5 | Section "InputDevice" | ||
6 | Identifier "Generic Keyboard" | ||
7 | Driver "evdev" | ||
8 | Option "CoreKeyboard" | ||
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
10 | Option "XkbRules" "xorg" | ||
11 | Option "XkbModel" "evdev" | ||
12 | Option "XkbLayout" "us" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputDevice" | ||
16 | Identifier "Configured Mouse" | ||
17 | Driver "vmmouse" | ||
18 | Option "CorePointer" | ||
19 | Option "Device" "/dev/input/mice" | ||
20 | Option "Protocol" "ImPS/2" | ||
21 | Option "ZAxisMapping" "4 5" | ||
22 | Option "Emulate3Buttons" "true" | ||
23 | EndSection | ||
24 | |||
25 | Section "InputDevice" | ||
26 | Identifier "Qemu Tablet" | ||
27 | Driver "evdev" | ||
28 | Option "CorePointer" | ||
29 | Option "Device" "/dev/input/touchscreen0" | ||
30 | Option "USB" "on" | ||
31 | EndSection | ||
32 | |||
33 | Section "Monitor" | 5 | Section "Monitor" |
34 | Identifier "Generic Monitor" | 6 | Identifier "Generic Monitor" |
35 | Option "DPMS" | 7 | Option "DPMS" |
@@ -57,8 +29,5 @@ EndSection | |||
57 | Section "ServerLayout" | 29 | Section "ServerLayout" |
58 | Identifier "Default Layout" | 30 | Identifier "Default Layout" |
59 | Screen "Default Screen" | 31 | Screen "Default Screen" |
60 | InputDevice "Generic Keyboard" | ||
61 | # InputDevice "Configured Mouse" | ||
62 | InputDevice "QEMU Tablet" | ||
63 | Option "AllowEmptyInput" "no" | 32 | Option "AllowEmptyInput" "no" |
64 | EndSection | 33 | EndSection |