diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-05-27 15:40:59 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-27 13:21:49 +0100 |
| commit | 729999cb384978404ecdfa8ea4ae0eb831fb9ece (patch) | |
| tree | bf9deb7d2b1381349986cc6cbef6dff97400548a /meta | |
| parent | bc4b86639a713c877dbe5e0f984873915d1578d4 (diff) | |
| download | openembedded-core-729999cb384978404ecdfa8ea4ae0eb831fb9ece.tar.gz openembedded-core-729999cb384978404ecdfa8ea4ae0eb831fb9ece.tar.bz2 openembedded-core-729999cb384978404ecdfa8ea4ae0eb831fb9ece.zip | |
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>
Diffstat (limited to 'meta')
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" |