xorg.conf: update keyboard config with evdev

with xserver 1.10, the evdev driver is used by default, so update the
keyboard config entry in xorg.conf accordingly.

Fix [YOCTO #1108]

Signed-off-by: Yu Ke <ke.yu@intel.com>

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 4216de7bdf35e4453a88024ae29de77c29115578..10a6d9a0bc3d97802b274a04b816e1d25a4a443e 100644 (file)
--- 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
@@ -4,10 +4,11 @@ EndSection
 
 Section "InputDevice"
     Identifier    "Generic Keyboard"
-    Driver        "kbd"
+    Driver        "evdev"
     Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
     Option        "XkbRules"    "xorg"
-    Option        "XkbModel"    "pc105"
+    Option        "XkbModel"    "evdev"
     Option        "XkbLayout"    "us"
 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 4216de7bdf35e4453a88024ae29de77c29115578..10a6d9a0bc3d97802b274a04b816e1d25a4a443e 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
@@ -4,10 +4,11 @@ EndSection
 
 Section "InputDevice"
     Identifier    "Generic Keyboard"
-    Driver        "kbd"
+    Driver        "evdev"
     Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
     Option        "XkbRules"    "xorg"
-    Option        "XkbModel"    "pc105"
+    Option        "XkbModel"    "evdev"
     Option        "XkbLayout"    "us"
 EndSection
 

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index 035a4626196181bdb1cddb71aa25a08df7637531..970b4bdb1d4fcec209862f5135c0b95d0b7ffc5b 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "file://xorg.conf"