[oe-commits] [openembedded-core] 04/22: xserver-xf86-config: Remove legacy drivers from xorg.conf
git at git.openembedded.org
git at git.openembedded.org
Sun Oct 30 10:24:43 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 688089c8cd5fa411ae7ea592e7a09664d919a700
Author: Jussi Kukkonen <jussi.kukkonen at intel.com>
AuthorDate: Wed Oct 26 11:37:39 2016 +0300
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.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
.../xserver-xf86-config/qemuarm/xorg.conf | 31 ----------------------
.../xserver-xf86-config/qemumips/xorg.conf | 31 ----------------------
.../xserver-xf86-config/qemumips64/xorg.conf | 31 ----------------------
.../xserver-xf86-config/qemuppc/xorg.conf | 31 ----------------------
.../xserver-xf86-config/qemush4/xorg.conf | 31 ----------------------
.../xserver-xf86-config/qemux86-64/xorg.conf | 31 ----------------------
.../xserver-xf86-config/qemux86/xorg.conf | 31 ----------------------
7 files changed, 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 629ae21..f4cd139 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Device"
Identifier "Graphics Controller"
Driver "fbdev"
@@ -62,8 +34,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
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 e6c8b51..1d3c64f 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Device"
Identifier "Graphics Controller"
Driver "fbdev"
@@ -63,8 +35,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
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 629ae21..f4cd139 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Device"
Identifier "Graphics Controller"
Driver "fbdev"
@@ -62,8 +34,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
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 629ae21..f4cd139 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Device"
Identifier "Graphics Controller"
Driver "fbdev"
@@ -62,8 +34,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
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 629ae21..f4cd139 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Device"
Identifier "Graphics Controller"
Driver "fbdev"
@@ -62,8 +34,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
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 bbda9ea..c12d92c 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "vmmouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Monitor"
Identifier "Generic Monitor"
Option "DPMS"
@@ -57,8 +29,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
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 bbda9ea..c12d92c 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 @@
Section "Files"
EndSection
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "vmmouse"
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
Section "Monitor"
Identifier "Generic Monitor"
Option "DPMS"
@@ -57,8 +29,5 @@ EndSection
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
Option "AllowEmptyInput" "no"
EndSection
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list