[yocto] [meta-raspberrypi][PATCH] xserver-xf86-config: remove evdev configuration

[Gary Thomas]

On 2017-02-16 12:49, Andreas Müller wrote:
> xorg-xserver recommends xf86-input-libinput since oe-core's commit
>
> | commit 2d005faff6341a81a2afae28860101ba9db51ae8
> | Author: Jussi Kukkonen <jussi.kukkonen at 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 at googlemail.com>

So, does this let my simple config (HDMI+USB keyboard/mouse) work with no
further fiddling?

> ---
>  .../rpi/xorg.conf.d/10-evdev.conf                  | 40 ----------------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  | 22 ++++++------
>  2 files changed, 10 insertions(+), 52 deletions(-)
>  delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-evdev.conf
>
> 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 @@
> -#
> -# Catch-all evdev loader for udev-based systems
> -# We don't simply match on any device since that also adds accelerometers
> -# and other devices that we don't really want to use. The list below
> -# matches everything but joysticks.
> -
> -Section "InputClass"
> -        Identifier "evdev pointer catchall"
> -        MatchIsPointer "on"
> -        MatchDevicePath "/dev/input/event*"
> -        Driver "evdev"
> -EndSection
> -
> -Section "InputClass"
> -        Identifier "evdev keyboard catchall"
> -        MatchIsKeyboard "on"
> -        MatchDevicePath "/dev/input/event*"
> -        Driver "evdev"
> -EndSection
> -
> -Section "InputClass"
> -        Identifier "evdev touchpad catchall"
> -        MatchIsTouchpad "on"
> -        MatchDevicePath "/dev/input/event*"
> -        Driver "evdev"
> -EndSection
> -
> -Section "InputClass"
> -        Identifier "evdev tablet catchall"
> -        MatchIsTablet "on"
> -        MatchDevicePath "/dev/input/event*"
> -        Driver "evdev"
> -EndSection
> -
> -Section "InputClass"
> -        Identifier "evdev touchscreen catchall"
> -        MatchIsTouchscreen "on"
> -        MatchDevicePath "/dev/input/event*"
> -        Driver "evdev"
> -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 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> -SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf \
> -                       file://xorg.conf.d/98-pitft.conf \
> -                       file://xorg.conf.d/99-calibration.conf \
> -                     "
> +SRC_URI_append_rpi = " \
> +    file://xorg.conf.d/98-pitft.conf \
> +    file://xorg.conf.d/99-calibration.conf \
> +"
>
>  do_install_append_rpi () {
> -	install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
> -	install -m 0644 ${WORKDIR}/xorg.conf.d/10-evdev.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> -
> -	PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
> -	if [ "${PITFT}" = "1" ]; then
> -		install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> -		install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> -	fi
> +    PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
> +    if [ "${PITFT}" = "1" ]; then
> +        install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
> +        install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> +        install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
> +    fi
>  }
>
>  FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*"
>


-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------