Patchwork xserver-xorg: Modify RREPLACES for RCONFLICTS

login
register
mail settings
Submitter Saul Wold
Date Sept. 17, 2012, 4:17 p.m.
Message ID <1347898621-24929-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/36647/
State New
Headers show

Comments

Saul Wold - Sept. 17, 2012, 4:17 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
 .../xorg-xserver/xserver-xorg-common.inc           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Gary Thomas - Sept. 17, 2012, 4:30 p.m.
On 2012-09-17 10:17, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
>   .../xorg-xserver/xserver-xorg-common.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 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 \
>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r6"
> +PR = "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 \
>
>   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)?

>
>   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"
>
Mark Hatle - Sept. 17, 2012, 4:45 p.m.
On 9/17/12 11:30 AM, Gary Thomas wrote:
> On 2012-09-17 10:17, Saul Wold wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>>    .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
>>    .../xorg-xserver/xserver-xorg-common.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 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 \
>>    SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>>    SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>>
>> -PR = "r6"
>> +PR = "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 \
>>
>>    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)?

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

>>
>>    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"
>>
>
Ross Burton - Sept. 17, 2012, 5:42 p.m.
On 17 September 2012 17:45, Mark Hatle <mark.hatle@windriver.com> wrote:
> 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
Saul Wold - Sept. 17, 2012, 5:49 p.m.
On 09/17/2012 10:42 AM, Burton, Ross wrote:
> On 17 September 2012 17:45, Mark Hatle <mark.hatle@windriver.com> wrote:
>> 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!

> Ross
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>

Patch

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 \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r6"
+PR = "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 \
 
 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"