* [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS
@ 2012-09-17 16:17 Saul Wold
2012-09-17 16:30 ` Gary Thomas
0 siblings, 1 reply; 5+ messages in thread
From: Saul Wold @ 2012-09-17 16:17 UTC (permalink / raw)
To: openembedded-core
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})"
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.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-17 16:17 [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS Saul Wold
@ 2012-09-17 16:30 ` Gary Thomas
2012-09-17 16:45 ` Mark Hatle
0 siblings, 1 reply; 5+ messages in thread
From: Gary Thomas @ 2012-09-17 16:30 UTC (permalink / raw)
To: openembedded-core
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"
>
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-17 16:30 ` Gary Thomas
@ 2012-09-17 16:45 ` Mark Hatle
2012-09-17 17:42 ` Burton, Ross
0 siblings, 1 reply; 5+ messages in thread
From: Mark Hatle @ 2012-09-17 16:45 UTC (permalink / raw)
To: openembedded-core
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"
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-17 16:45 ` Mark Hatle
@ 2012-09-17 17:42 ` Burton, Ross
2012-09-17 17:49 ` Saul Wold
0 siblings, 1 reply; 5+ messages in thread
From: Burton, Ross @ 2012-09-17 17:42 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-core
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-17 17:42 ` Burton, Ross
@ 2012-09-17 17:49 ` Saul Wold
0 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-09-17 17:49 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-core
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
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-17 18:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-17 16:17 [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS Saul Wold
2012-09-17 16:30 ` Gary Thomas
2012-09-17 16:45 ` Mark Hatle
2012-09-17 17:42 ` Burton, Ross
2012-09-17 17:49 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox