sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Otavio Salvador 2012-09-28 10:31:21 -03:00 committed by Richard Purdie
parent 15216fc1ec
commit 1ed2073a01
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
View File

@ -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"

2
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
View File

@ -10,4 +10,4 @@ SRC_URI += "file://crosscompile.patch \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
PR = "r9"
PR = "r10"