diff options
author | Yu Ke <ke.yu@intel.com> | 2011-05-27 15:40:59 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-05-27 10:48:28 -0700 |
commit | 35c39d2bd95213057b54f2cf2a239e06aec0fe5c (patch) | |
tree | c561472c53a86a528dcecf986b270fa02b378fd2 /meta | |
parent | 38ab87bd32da95e386c70951a2fd91422cdcfeb0 (diff) | |
download | poky-35c39d2bd95213057b54f2cf2a239e06aec0fe5c.tar.gz |
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 <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | |||
4 | 4 | ||
5 | Section "InputDevice" | 5 | Section "InputDevice" |
6 | Identifier "Generic Keyboard" | 6 | Identifier "Generic Keyboard" |
7 | Driver "kbd" | 7 | Driver "evdev" |
8 | Option "CoreKeyboard" | 8 | Option "CoreKeyboard" |
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
9 | Option "XkbRules" "xorg" | 10 | Option "XkbRules" "xorg" |
10 | Option "XkbModel" "pc105" | 11 | Option "XkbModel" "evdev" |
11 | Option "XkbLayout" "us" | 12 | Option "XkbLayout" "us" |
12 | EndSection | 13 | EndSection |
13 | 14 | ||
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 | |||
4 | 4 | ||
5 | Section "InputDevice" | 5 | Section "InputDevice" |
6 | Identifier "Generic Keyboard" | 6 | Identifier "Generic Keyboard" |
7 | Driver "kbd" | 7 | Driver "evdev" |
8 | Option "CoreKeyboard" | 8 | Option "CoreKeyboard" |
9 | Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd" | ||
9 | Option "XkbRules" "xorg" | 10 | Option "XkbRules" "xorg" |
10 | Option "XkbModel" "pc105" | 11 | Option "XkbModel" "evdev" |
11 | Option "XkbLayout" "us" | 12 | Option "XkbLayout" "us" |
12 | EndSection | 13 | EndSection |
13 | 14 | ||
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" | |||
3 | SECTION = "x11/base" | 3 | SECTION = "x11/base" |
4 | LICENSE = "MIT-X" | 4 | LICENSE = "MIT-X" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | PR = "r9" | 6 | PR = "r10" |
7 | 7 | ||
8 | SRC_URI = "file://xorg.conf" | 8 | SRC_URI = "file://xorg.conf" |
9 | 9 | ||