On Thu, Sep 27, 2012 at 02:29:25PM +0000, [email protected] wrote: > Module: openembedded-core.git > Branch: master > Commit: ed0216d29fc4355c5220f3ad51df04a63cacb0c3 > URL: > http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ed0216d29fc4355c5220f3ad51df04a63cacb0c3 > > Author: Martin Jansa <[email protected]> > Date: Sat Sep 22 19:13:14 2012 +0200 > > xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa > > * 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 > > Also fixes whitespace to work correctly with opkg
The whitespace problem wasn't opkg fault AFAIK, but bb.utils.explode_dep_versions as shown in http://patchwork.openembedded.org/patch/37069/ Cheers > > Signed-off-by: Martin Jansa <[email protected]> > > -- > > * 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 > Signed-off-by: Richard Purdie <[email protected]> > > --- > > .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > index 643ca70..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" > > > _______________________________________________ > Openembedded-commits mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
