[OE-core] [oe-commits] Saul Wold : xserver-xorg: Modify RREPLACES for RCONFLICTS

[Martin Jansa]

On Wed, Sep 19, 2012 at 05:03:33PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 467c59495d83748d35846e8b37548182fea99cbf
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=467c59495d83748d35846e8b37548182fea99cbf
> 
> Author: Saul Wold <sgw at linux.intel.com>
> Date:   Mon Sep 17 09:17:01 2012 -0700
> 
> xserver-xorg: Modify RREPLACES for RCONFLICTS
> 
> fix bad runtime dependency that was causing -exa to be a suitable candidate for xserver-xorg, thus resulting in no X server in some situations
> 
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> 
> ---
> 
>  .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
>  .../recipes-graphics/xorg-xserver/xserver-xorg.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 c71896a..35cb33a 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 = "r7"
> +PR = "r8"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 210abad..643ca70 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"
> -RREPLACES_${PN}-module-exa = "${PN}"
> +RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"

Hmm now it fails in do_rootfs for me :/

| Collected errors:
|  * check_conflicts_for: The following packages conflict with xserver-xorg-module-exa:
|  * check_conflicts_for: 	xserver-xorg *
|  * opkg_install_cmd: Cannot install package packagegroup-shr-minimal-x.
| ERROR: Function failed: do_rootfs (see /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/om_gta02-oe-linux-gnueabi/shr-image-2.0-r20/temp/log.do_rootfs.8716 for further information)

>  
>  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
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
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/20120921/2d457d09/attachment-0002.sig>