[oe-commits] Yu Ke : xorg.conf: update keyboard config with evdev
git version control
git at git.openembedded.org
Fri May 27 12:22:26 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 729999cb384978404ecdfa8ea4ae0eb831fb9ece
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=729999cb384978404ecdfa8ea4ae0eb831fb9ece
Author: Yu Ke <ke.yu at intel.com>
Date: Fri May 27 15:40:59 2011 +0800
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 at intel.com>
---
.../xserver-xf86-config/qemux86-64/xorg.conf | 5 +++--
.../xserver-xf86-config/qemux86/xorg.conf | 5 +++--
.../xorg-xserver/xserver-xf86-config_0.1.bb | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
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 4216de7..10a6d9a 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
@@ -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 4216de7..10a6d9a 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
@@ -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 035a462..970b4bd 100644
--- 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"
More information about the Openembedded-commits
mailing list