[OE-core] [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa

Richard Purdie richard.purdie at linuxfoundation.org
Mon Sep 24 10:20:03 UTC 2012


On Sat, 2012-09-22 at 19:13 +0200, Martin Jansa wrote:
> * it doesn't make much sense with PV, because xserver-xorg-module-exa
>   was introduced in
>   http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
>   so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4)
>   and (< 1.11.2) is not good enough
> 
> * because we don't know how many PRINC are in BSP/DISTRO layers,
>   then it's safer to RCONFLICTS with every older version then current
>   EXTENDPKGV
> 
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> 
> --
> 
> * I haven't really tested this with IPK, since it was changed from
>   RREPLACES to RCONFLICTS (because of RPM) and all my installed devices
>   are already upgraded
> ---
>  meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 33f59fe..7513399 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} (< ${EXTENDPKGV})"
>  
>  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"

The original patch and this patch are wrong, this value should not be
"floating". It should be spelt out explicitly so it doesn't change with
the recipe version in future.:

RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r4)"

Cheers,

Richard





More information about the Openembedded-core mailing list