From 8fb19876215a8c7918361e8360c4342d1a933a93 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 27 Sep 2012 15:47:49 -0300 Subject: xserver-xorg: Use rdepends to ensure xserver-xorg-module-exa match version This fix the installation of xserver-xorg-module-exa package at rootfs using opkg. It were failing as conflicts where not working properly. Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 7513399344..9b474de120 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -67,6 +67,7 @@ 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" FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" 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 c707567b1e..2512fb2351 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 = "r8" +PR = "r9" -- cgit v1.2.3