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

[Martin Jansa]

On Mon, Sep 24, 2012 at 11:20:03AM +0100, Richard Purdie wrote:
> 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)"

While testing this I've noticed another (probably just opkg status bug),
see Conflicts field in Packages file and then the same package in opkg
status:

But both packages were installed fine together (so extra = is probably only shown).

SHR root at gjama ~ $ grep -A 15 "Package: xserver-xorg-module-exa" /var/lib/opkg/jama-armv7a-vfp-neon
Package: xserver-xorg-module-exa
Version: 2:1.11.2-r10
Depends: libc6 (>= 2.16)
Conflicts: xserver-xorg (< 2:1.11.2-r10)
Section: x11/base
Architecture: armv7a-vfp-neon
Maintainer: OE-Core Developers <openembedded-core at lists.openembedded.org>
MD5Sum: 4082f6813a30480b94921a0e322d2117
Size: 42254
Filename: xserver-xorg-module-exa_1.11.2-r10_armv7a-vfp-neon.ipk
Source: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.2.tar.bz2 file://macro_tweak.patch file://crosscompile.patch file://fix_open_max_preprocessor_error.patch file://gcc-47-warning.patch file://mips64-compiler.patch file://randr-support.patch
Description:  xserver-xorg version 1.11.2-r10  The X.Org X server
OE: xserver-xorg
HomePage: http://www.x.org
License: MIT-X
Priority: optional

SHR root at gjama ~ $ opkg info xserver-xorg-module-exa
Package: xserver-xorg-module-exa
Version: 2:1.11.2-r10
Depends: libc6 (>= 2.16)
Provides:
Conflicts: xserver-xorg (<= 2:1.11.2-r10)
Status: install user installed
Section: x11/base
Architecture: armv7a-vfp-neon
Maintainer: OE-Core Developers <openembedded-core at lists.openembedded.org>
MD5Sum: 4082f6813a30480b94921a0e322d2117
Size: 42254
Filename: xserver-xorg-module-exa_1.11.2-r10_armv7a-vfp-neon.ipk
Source: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.2.tar.bz2 file://macro_tweak.patch file://crosscompile.patch file://fix_open_max_preprocessor_error.patch file://gcc-47-warning.patch file://mips64-compiler.patch file://randr-support.patch
Description: xserver-xorg version 1.11.2-r10  The X.Org X server
Installed-Time: 1348494842

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120924/daaddbf5/attachment-0002.sig>