Patchwork xorg-font-common.inc: break runtime dependency loop

login
register
mail settings
Submitter Andreas Müller
Date Dec. 18, 2011, 1:03 a.m.
Message ID <1324170197-10720-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/17191/
State Superseded
Headers show

Comments

Andreas Müller - Dec. 18, 2011, 1:03 a.m.
required since opkg update [1]

[1] http://cgit.openembedded.org/openembedded-core/commit/?id=2feba313c991170747381c7cf821a45c2cd04632

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../xorg-font/xorg-font-common.inc                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Koen Kooi - Dec. 18, 2011, 9:20 a.m.
Op 18 dec. 2011, om 02:03 heeft Andreas Müller het volgende geschreven:

> required since opkg update [1]
> 
> [1] http://cgit.openembedded.org/openembedded-core/commit/?id=2feba313c991170747381c7cf821a45c2cd04632
> 
> Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>

I was planning to send something reallly similar looking on monday :)

Acked-by: Koen Kooi <koen@dominion.thruhere.net>

> ---
> .../xorg-font/xorg-font-common.inc                 |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
> index d93b4ee..5a8ae56 100644
> --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc
> +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
> @@ -5,10 +5,10 @@ SECTION = "x11/fonts"
> LICENSE = "MIT-X"
> 
> DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
> -RDEPENDS_${PN} = "encodings font-util font-alias"
> +RRECOMMENDS_${PN} = "encodings font-util font-alias"
> 
> XORG_PN = "${BPN}"
> -INC_PR = "r2"
> +INC_PR = "r3"
> 
> SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
> S = "${WORKDIR}/${XORG_PN}-${PV}"
> -- 
> 1.7.4.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Andreas Müller - Dec. 19, 2011, 12:48 a.m.
On Sunday, December 18, 2011 02:03:17 AM Andreas Müller wrote:
> required since opkg update [1]
> 
Hope there is no need to apply this one. Will test RP's patch tomorrow

Andreas
Richard Purdie - Dec. 19, 2011, 2:45 p.m.
On Mon, 2011-12-19 at 01:48 +0100, Andreas Müller wrote:
> On Sunday, December 18, 2011 02:03:17 AM Andreas Müller wrote:
> > required since opkg update [1]
> > 
> Hope there is no need to apply this one. Will test RP's patch tomorrow

To be honest the font-* dependencies look rather wrong to me and in need
of disentangling. I'll hold off this patch and see if we can some up
with something better though.

I suspect the better fix would be to have the actual fonts have a
separate.inc with the dependencies so encodings/utils/alias don't get
those defaults...

Cheers,

Richard

Patch

diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
index d93b4ee..5a8ae56 100644
--- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc
+++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
@@ -5,10 +5,10 @@  SECTION = "x11/fonts"
 LICENSE = "MIT-X"
 
 DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
-RDEPENDS_${PN} = "encodings font-util font-alias"
+RRECOMMENDS_${PN} = "encodings font-util font-alias"
 
 XORG_PN = "${BPN}"
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"