From 35c39d2bd95213057b54f2cf2a239e06aec0fe5c Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Fri, 27 May 2011 15:40:59 +0800 Subject: 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] (From OE-Core rev: 729999cb384978404ecdfa8ea4ae0eb831fb9ece) Signed-off-by: Yu Ke Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf | 5 +++-- .../xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | 5 +++-- meta/recipes-graphics/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 4216de7bdf..10a6d9a0bc 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 4216de7bdf..10a6d9a0bc 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 035a462619..970b4bdb1d 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" -- cgit v1.2.3-54-g00ecf