diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-28 10:31:21 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 15:19:43 +0100 |
| commit | 1ed2073a01d9d649bd61ed30f2991bb5f351aa20 (patch) | |
| tree | 183c795477737dab2e0c36c54bc73de862fe36b7 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
| parent | 15216fc1ec10c93d009f1a6262e90cada5254697 (diff) | |
| download | poky-1ed2073a01d9d649bd61ed30f2991bb5f351aa20.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 |
1 files changed, 0 insertions, 1 deletions
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 \ | |||
| 66 | 66 | ||
| 67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" | 67 | RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" |
| 68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | 68 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" |
| 69 | RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})" | ||
| 70 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | 69 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" |
| 71 | 70 | ||
| 72 | 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" | 71 | 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" |