[OE-core] [PATCH] xserver-xorg: Modify RREPLACES for RCONFLICTS
Mark Hatle
mark.hatle at windriver.com
Mon Sep 17 16:45:32 UTC 2012
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 at 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"
>>
>
More information about the Openembedded-core
mailing list