summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-09-16 01:29:25 (GMT)
committerSaul Wold <sgw@linux.intel.com>2012-09-16 01:29:25 (GMT)
commitae631a5ed00b5f42c928913fcbada26f670adce9 (patch)
tree83197b3782a16c24dbd538c08a9bd49551440477
parent2611db5d9c34d32ee388f776edbbb37c2fee04a2 (diff)
downloadpoky-ae631a5ed00b5f42c928913fcbada26f670adce9.tar.gz
xserver-xorg: Modify RREPLACES for RCONFLICTS
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b4a348c..c71896a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" 8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" 9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
10 10
11PR = "r6" 11PR = "r7"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 6133344..98fe534 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
66 66
67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" 67RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
68RDEPENDS_${PN}-xvfb += "xkeyboard-config" 68RDEPENDS_${PN}-xvfb += "xkeyboard-config"
69RREPLACES_${PN}-module-exa = "${PN}" 69RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
70 70
71FILES_${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" 71FILES_${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"
72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" 72FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"