summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-09-22 19:13:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-27 15:21:54 +0100
commit6d7e9d42eba463c91c31dc1e15d4c1189e6a8b8f (patch)
tree23f8beae5eba82c5da18c785b0cde5e622540880 /meta/recipes-graphics/xorg-xserver
parent3d25fc9aeb3513dba3dc27d52cb333cbe3ebb86c (diff)
downloadpoky-6d7e9d42eba463c91c31dc1e15d4c1189e6a8b8f.tar.gz
xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa
* it doesn't make much sense with PV, because xserver-xorg-module-exa was introduced in http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66 so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4) and (< 1.11.2) is not good enough * because we don't know how many PRINC are in BSP/DISTRO layers, then it's safer to RCONFLICTS with every older version then current EXTENDPKGV Also fixes whitespace to work correctly with opkg (From OE-Core rev: ed0216d29fc4355c5220f3ad51df04a63cacb0c3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -- * I haven't really tested this with IPK, since it was changed from RREPLACES to RCONFLICTS (because of RPM) and all my installed devices are already upgraded Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 643ca70583..7513399344 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.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"
69RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})" 69RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
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"