[OE-core] [PATCH] xserver-xorg: fix RCONFLICTS line
Martin Jansa
martin.jansa at gmail.com
Sat Sep 22 17:13:13 UTC 2012
* there needs to be space between '<' and PV, see:
>>> bb.utils.explode_dep_versions('xserver-xorg (<1.11.2)')
{'xserver-xorg': None}
>>> bb.utils.explode_dep_versions('xserver-xorg (< 1.11.2)')
{'xserver-xorg': '< 1.11.2'}
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 2 +-
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
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 35cb33a..32bd9fd 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 \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r8"
+PR = "r9"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 643ca70..33f59fe 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 \
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
+RCONFLICTS_${PN}-module-exa = "${PN} (< ${PV})"
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"
--
1.7.12
More information about the Openembedded-core
mailing list