diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-02-16 12:49:01 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-03-11 04:39:15 -0800 |
commit | 52bec45b6785abad3dd6ff7388ae8f9f491025df (patch) | |
tree | d1e3748aa7229e25b5628bf84db0bd65385d7815 | |
parent | c01466aabb9bda5b34fbcb3802bfe586ae7fdc53 (diff) | |
download | meta-raspberrypi-52bec45b6785abad3dd6ff7388ae8f9f491025df.tar.gz |
xserver-xf86-config: remove evdev configuration
xorg-xserver recommends xf86-input-libinput since oe-core's commit
| commit 2d005faff6341a81a2afae28860101ba9db51ae8
| Author: Jussi Kukkonen <jussi.kukkonen@intel.com>
| Date: Wed Oct 26 11:37:38 2016 +0300
|
| conf: Use xf86-input-libinput by default
| ...
As nice side effect warnings for missing evdev in Xorg.0.log are gone.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-evdev.conf | 40 | ||||
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 22 |
2 files changed, 10 insertions, 52 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-evdev.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-evdev.conf deleted file mode 100644 index cc83ab2..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-evdev.conf +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | # | ||
2 | # Catch-all evdev loader for udev-based systems | ||
3 | # We don't simply match on any device since that also adds accelerometers | ||
4 | # and other devices that we don't really want to use. The list below | ||
5 | # matches everything but joysticks. | ||
6 | |||
7 | Section "InputClass" | ||
8 | Identifier "evdev pointer catchall" | ||
9 | MatchIsPointer "on" | ||
10 | MatchDevicePath "/dev/input/event*" | ||
11 | Driver "evdev" | ||
12 | EndSection | ||
13 | |||
14 | Section "InputClass" | ||
15 | Identifier "evdev keyboard catchall" | ||
16 | MatchIsKeyboard "on" | ||
17 | MatchDevicePath "/dev/input/event*" | ||
18 | Driver "evdev" | ||
19 | EndSection | ||
20 | |||
21 | Section "InputClass" | ||
22 | Identifier "evdev touchpad catchall" | ||
23 | MatchIsTouchpad "on" | ||
24 | MatchDevicePath "/dev/input/event*" | ||
25 | Driver "evdev" | ||
26 | EndSection | ||
27 | |||
28 | Section "InputClass" | ||
29 | Identifier "evdev tablet catchall" | ||
30 | MatchIsTablet "on" | ||
31 | MatchDevicePath "/dev/input/event*" | ||
32 | Driver "evdev" | ||
33 | EndSection | ||
34 | |||
35 | Section "InputClass" | ||
36 | Identifier "evdev touchscreen catchall" | ||
37 | MatchIsTouchscreen "on" | ||
38 | MatchDevicePath "/dev/input/event*" | ||
39 | Driver "evdev" | ||
40 | EndSection | ||
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index 062de2d..b361eef 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | |||
@@ -1,19 +1,17 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \ | 3 | SRC_URI_append_rpi = " \ |
4 | file://xorg.conf.d/98-pitft.conf \ | 4 | file://xorg.conf.d/98-pitft.conf \ |
5 | file://xorg.conf.d/99-calibration.conf \ | 5 | file://xorg.conf.d/99-calibration.conf \ |
6 | " | 6 | " |
7 | 7 | ||
8 | do_install_append_rpi () { | 8 | do_install_append_rpi () { |
9 | install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ | 9 | PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" |
10 | install -m 0644 ${WORKDIR}/xorg.conf.d/10-evdev.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ | 10 | if [ "${PITFT}" = "1" ]; then |
11 | 11 | install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ | |
12 | PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" | 12 | install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ |
13 | if [ "${PITFT}" = "1" ]; then | 13 | install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ |
14 | install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ | 14 | fi |
15 | install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ | ||
16 | fi | ||
17 | } | 15 | } |
18 | 16 | ||
19 | FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" | 17 | FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" |