From 1ed2073a01d9d649bd61ed30f2991bb5f351aa20 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 28 Sep 2012 10:31:21 -0300 Subject: xserver-xorg: Remove RCONFLICTS against xserver-xorg When merging the xserver-xorg fix the to use RDEPENDS in xserver-xorg-module-exa the RCONFLICTS has not been removed by mistake. This drops the RCONFLICTS to properly fix it. (From OE-Core rev: d83e218dc480a09befddf8b934d774519cdbacb5) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9b474de120..bea0252259 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -66,7 +66,6 @@ PACKAGES =+ "${PN}-security-policy \ RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})" RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" -- cgit v1.2.3-54-g00ecf