diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-27 15:47:49 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 11:07:42 +0100 |
commit | b0f4a5bc234013886237b653eb6a5a19711a02e1 (patch) | |
tree | 37dde336aeaa5c82b72223f0956e238db2e9ce00 /meta/recipes-graphics | |
parent | ad1aa810ac0f24e69185d30964c3b2cc1ca822d7 (diff) | |
download | poky-b0f4a5bc234013886237b653eb6a5a19711a02e1.tar.gz |
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.
(From OE-Core rev: 8fb19876215a8c7918361e8360c4342d1a933a93)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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, 2 insertions, 1 deletions
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 \ | |||
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})" | 69 | RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})" |
70 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | ||
70 | 71 | ||
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" | 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" |
72 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" | 73 | 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 \ | |||
10 | SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" | 10 | SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" |
11 | SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" | 11 | SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" |
12 | 12 | ||
13 | PR = "r8" | 13 | PR = "r9" |