From 16d6c3013ea876330102f30c56e50f6fe93e01f7 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 31 Dec 2015 11:57:33 +0100 Subject: xserver-xorg_1.14.7.bb: don't deploy 10-evdev.conf With the update 'xf86-input-evdev: Upgrade 2.9.2 -> 2.10.0' this file is provided by the evdev recipe. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'recipes-graphics') diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb index 1050039..a24f12f 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb @@ -37,3 +37,8 @@ RCONFLICTS_${PN} = "${PN}-extension-dri \ ${PN}-extension-extmod \ ${PN}-extension-dbe \ " + +# provided by xf86-input-evdev_2.10.0 +do_install_append () { + rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf +} \ No newline at end of file -- cgit v1.2.3