xserver-xorg: Modify RREPLACES for RCONFLICTS
PATCH 1/1 xserver-xorg: Modify RREPLACES for RCONFLICTS
--- .../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +- .../xorg-xserver/xserver-xorg-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +1 -1
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r6" +PR = "r7"
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +1 -1
@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \ RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RREPLACES_${PN}-module-exa = "${PN}" +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"
Signature · 1 line
1.7.9.5
Quoted 21 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>--- .../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +- .../xorg-xserver/xserver-xorg-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +1
-1@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r6" +PR = "r7"meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0
-0
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc PACKAGES =+ "${PN}-security-policy \ · line 69
Quoted 5 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +1
-1@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \ RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RREPLACES_${PN}-module-exa = "${PN}" +RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
Can you please explain what this means (the syntax is unknown to me)?
Quoted 4 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0
-0FILES_${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"
Signature · 4 lines
------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------
Quoted 23 lines · Gary Thomas
Quoted 22 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>--- .../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +- .../xorg-xserver/xserver-xorg-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +1
-1@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r6" +PR = "r7"meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0
-0@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
Quoted 6 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc PACKAGES =+ "${PN}-security-policy \ · line 69
Quoted 4 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +1
-1RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RREPLACES_${PN}-module-exa = "${PN}" +RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"Can you please explain what this means (the syntax is unknown to me)?
This is deb/opkg style syntax..
<package> (<comparison> <version>)
So it means ${PN}-module-exa will conflict with any version of ${PN} older then the current version.
--Mark
Quoted 5 lines
Quoted 4 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0
-0FILES_${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"
Quoted 6 lines · Mark Hatle
This is deb/opkg style syntax..
<package> (<comparison> <version>)
So it means ${PN}-module-exa will conflict with any version of ${PN} older then the current version.
Does this actually work? I was talking to Constantin earlier who was attempting a similar migration path for the netbase package split and he was having trouble making it do what we'd expect.
Ross
Quoted 12 lines · Ross
Quoted 6 lines · Mark Hatle
This is deb/opkg style syntax..
<package> (<comparison> <version>)
So it means ${PN}-module-exa will conflict with any version of ${PN} older then the current version.
Does this actually work? I was talking to Constantin earlier who was attempting a similar migration path for the netbase package split and he was having trouble making it do what we'd expect.
I used this for the M4 build and it seems to work and installed the xserver.
Sau!
Quoted 8 lines
Ross
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core