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:16:52 +0100 |
| commit | d83e218dc480a09befddf8b934d774519cdbacb5 (patch) | |
| tree | 7ce898c38d49a94175e865e7f14de94031a10ff6 | |
| parent | a5ff8396cad130f809f8f8da49bb38e6f80f923c (diff) | |
| download | openembedded-core-d83e218dc480a09befddf8b934d774519cdbacb5.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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 2 |
2 files changed, 1 insertions, 2 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 \ 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 2512fb2351..a219f814ac 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" |