From: Otavio Salvador Date: Fri, 28 Sep 2012 13:31:21 +0000 (-0300) Subject: xserver-xorg: Remove RCONFLICTS against xserver-xorg X-Git-Tag: rev_ivi_2015_02_04~15325 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee523185f97f2f595c42f641d4048b99b2f9cc17;p=scm%2Fbb%2Ftizen-distro.git 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 --- diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9b474de..bea0252 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" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb index 2512fb2..a219f81 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb @@ -10,4 +10,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r9" +PR = "r10"