* [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES @ 2012-02-10 1:27 Andreas Oberritter 2012-02-10 8:38 ` Koen Kooi 2012-02-24 18:28 ` [PATCH/RFC] " Saul Wold 0 siblings, 2 replies; 9+ messages in thread From: Andreas Oberritter @ 2012-02-10 1:27 UTC (permalink / raw) To: openembedded-core * If 'x11' is not set in DISTRO_FEATURES, then skip all recipes using xorg-lib-common.inc instead of only those using libx11.inc. * One exception: pixman, which is not only used by xorg, but also by cairo. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 748a48c..9057edc 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -49,8 +49,3 @@ do_compile_prepend() { # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 # A world build should only build the correct version, not all of them. EXCLUDE_FROM_WORLD = "1" - -python () { - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") -} diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index d106054..3d5d378 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" + +python () { + whitelist = [ "pixman" ] + if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): + raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") +} -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-10 1:27 [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES Andreas Oberritter @ 2012-02-10 8:38 ` Koen Kooi 2012-02-10 12:19 ` Paul Eggleton 2012-02-24 18:28 ` [PATCH/RFC] " Saul Wold 1 sibling, 1 reply; 9+ messages in thread From: Koen Kooi @ 2012-02-10 8:38 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 10 feb. 2012, om 02:27 heeft Andreas Oberritter het volgende geschreven: > * If 'x11' is not set in DISTRO_FEATURES, then skip all > recipes using xorg-lib-common.inc instead of only those > using libx11.inc. > > * One exception: pixman, which is not only used by xorg, > but also by cairo. > > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > --- > meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- > meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++ > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc > index 748a48c..9057edc 100644 > --- a/meta/recipes-graphics/xorg-lib/libx11.inc > +++ b/meta/recipes-graphics/xorg-lib/libx11.inc > @@ -49,8 +49,3 @@ do_compile_prepend() { > # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 > # A world build should only build the correct version, not all of them. > EXCLUDE_FROM_WORLD = "1" > - > -python () { > - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): > - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") > -} > diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > index d106054..3d5d378 100644 > --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" > inherit autotools pkgconfig > > EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" > + > +python () { > + whitelist = [ "pixman" ] > + if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): > + raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") I know you're just moving the error message around, but I would suggest changing it to "'x11' not in DISTRO_FEATURES". regards, Koen ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-10 8:38 ` Koen Kooi @ 2012-02-10 12:19 ` Paul Eggleton 2012-02-10 12:26 ` [PATCH/RFC v2] " Andreas Oberritter 0 siblings, 1 reply; 9+ messages in thread From: Paul Eggleton @ 2012-02-10 12:19 UTC (permalink / raw) To: openembedded-core; +Cc: Koen Kooi On Friday 10 February 2012 09:38:59 Koen Kooi wrote: > I know you're just moving the error message around, but I would suggest > changing it to "'x11' not in DISTRO_FEATURES". You have to be careful with this, as it will pick up partial words e.g. assuming we had an "x11test" DISTRO_FEATURE then this would also be picked up by this statement; whereas oe.utils.contains() does a split to make it a list first and therefore does not have this issue. I'd suggest leaving it as-is, or if you really want to change it, do a split on the string first. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH/RFC v2] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-10 12:19 ` Paul Eggleton @ 2012-02-10 12:26 ` Andreas Oberritter 2012-02-10 12:41 ` Paul Eggleton 2012-02-10 12:42 ` Koen Kooi 0 siblings, 2 replies; 9+ messages in thread From: Andreas Oberritter @ 2012-02-10 12:26 UTC (permalink / raw) To: openembedded-core On 10.02.2012 13:19, Paul Eggleton wrote: > On Friday 10 February 2012 09:38:59 Koen Kooi wrote: >> I know you're just moving the error message around, but I would suggest >> changing it to "'x11' not in DISTRO_FEATURES". > > You have to be careful with this, as it will pick up partial words e.g. > assuming we had an "x11test" DISTRO_FEATURE then this would also be picked up > by this statement; whereas oe.utils.contains() does a split to make it a list > first and therefore does not have this issue. I'd suggest leaving it as-is, or > if you really want to change it, do a split on the string first. I think Koen was referring to the error string, see below. Regards, Andreas From 7d9633e0b1ccf85ec72f32d7d39952b467fa5cae Mon Sep 17 00:00:00 2001 From: Andreas Oberritter <obi@opendreambox.org> Date: Fri, 10 Feb 2012 02:10:15 +0100 Subject: [PATCH] xorg-lib: don't build libs unless requested by DISTRO_FEATURES * If 'x11' is not set in DISTRO_FEATURES, then skip all recipes using xorg-lib-common.inc instead of only those using libx11.inc. * One exception: pixman, which is not only used by xorg, but also by cairo. * Improve error message as suggested by Koen. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 748a48c..9057edc 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -49,8 +49,3 @@ do_compile_prepend() { # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 # A world build should only build the correct version, not all of them. EXCLUDE_FROM_WORLD = "1" - -python () { - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") -} diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index d106054..73a4d1d 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" + +python () { + whitelist = [ "pixman" ] + if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): + raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES") +} -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC v2] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-10 12:26 ` [PATCH/RFC v2] " Andreas Oberritter @ 2012-02-10 12:41 ` Paul Eggleton 2012-02-10 12:42 ` Koen Kooi 1 sibling, 0 replies; 9+ messages in thread From: Paul Eggleton @ 2012-02-10 12:41 UTC (permalink / raw) To: openembedded-core On Friday 10 February 2012 13:26:18 Andreas Oberritter wrote: > I think Koen was referring to the error string, see below. Ah I see, please disregard my comments then :) Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC v2] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-10 12:26 ` [PATCH/RFC v2] " Andreas Oberritter 2012-02-10 12:41 ` Paul Eggleton @ 2012-02-10 12:42 ` Koen Kooi 1 sibling, 0 replies; 9+ messages in thread From: Koen Kooi @ 2012-02-10 12:42 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 10 feb. 2012, om 13:26 heeft Andreas Oberritter het volgende geschreven: > On 10.02.2012 13:19, Paul Eggleton wrote: >> On Friday 10 February 2012 09:38:59 Koen Kooi wrote: >>> I know you're just moving the error message around, but I would suggest >>> changing it to "'x11' not in DISTRO_FEATURES". >> >> You have to be careful with this, as it will pick up partial words e.g. >> assuming we had an "x11test" DISTRO_FEATURE then this would also be picked up >> by this statement; whereas oe.utils.contains() does a split to make it a list >> first and therefore does not have this issue. I'd suggest leaving it as-is, or >> if you really want to change it, do a split on the string first. > > I think Koen was referring to the error string, see below. Indeed I was! > > Regards, > Andreas > > From 7d9633e0b1ccf85ec72f32d7d39952b467fa5cae Mon Sep 17 00:00:00 2001 > From: Andreas Oberritter <obi@opendreambox.org> > Date: Fri, 10 Feb 2012 02:10:15 +0100 > Subject: [PATCH] xorg-lib: don't build libs unless requested by > DISTRO_FEATURES > > * If 'x11' is not set in DISTRO_FEATURES, then skip all > recipes using xorg-lib-common.inc instead of only those > using libx11.inc. > > * One exception: pixman, which is not only used by xorg, > but also by cairo. > > * Improve error message as suggested by Koen. > > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > --- > meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- > meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++ > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc > index 748a48c..9057edc 100644 > --- a/meta/recipes-graphics/xorg-lib/libx11.inc > +++ b/meta/recipes-graphics/xorg-lib/libx11.inc > @@ -49,8 +49,3 @@ do_compile_prepend() { > # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 > # A world build should only build the correct version, not all of them. > EXCLUDE_FROM_WORLD = "1" > - > -python () { > - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): > - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") > -} > diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > index d106054..73a4d1d 100644 > --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" > inherit autotools pkgconfig > > EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" > + > +python () { > + whitelist = [ "pixman" ] > + if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): > + raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES") > +} > -- > 1.7.5.4 > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-10 1:27 [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES Andreas Oberritter 2012-02-10 8:38 ` Koen Kooi @ 2012-02-24 18:28 ` Saul Wold 2012-02-24 18:40 ` Andreas Oberritter 1 sibling, 1 reply; 9+ messages in thread From: Saul Wold @ 2012-02-24 18:28 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 02/09/2012 05:27 PM, Andreas Oberritter wrote: > * If 'x11' is not set in DISTRO_FEATURES, then skip all > recipes using xorg-lib-common.inc instead of only those > using libx11.inc. > > * One exception: pixman, which is not only used by xorg, > but also by cairo. > > Signed-off-by: Andreas Oberritter<obi@opendreambox.org> > --- > meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- > meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++ > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc > index 748a48c..9057edc 100644 > --- a/meta/recipes-graphics/xorg-lib/libx11.inc > +++ b/meta/recipes-graphics/xorg-lib/libx11.inc > @@ -49,8 +49,3 @@ do_compile_prepend() { > # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 > # A world build should only build the correct version, not all of them. > EXCLUDE_FROM_WORLD = "1" > - > -python () { > - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): > - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") > -} > diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > index d106054..3d5d378 100644 > --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc > @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" > inherit autotools pkgconfig > > EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" > + > +python () { > + whitelist = [ "pixman" ] > + if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): > + raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") > +} Merged into OE-core Thanks Sau! ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-24 18:28 ` [PATCH/RFC] " Saul Wold @ 2012-02-24 18:40 ` Andreas Oberritter 2012-02-26 11:42 ` Richard Purdie 0 siblings, 1 reply; 9+ messages in thread From: Andreas Oberritter @ 2012-02-24 18:40 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On 24.02.2012 19:28, Saul Wold wrote: > On 02/09/2012 05:27 PM, Andreas Oberritter wrote: >> * If 'x11' is not set in DISTRO_FEATURES, then skip all >> recipes using xorg-lib-common.inc instead of only those >> using libx11.inc. >> >> * One exception: pixman, which is not only used by xorg, >> but also by cairo. >> >> Signed-off-by: Andreas Oberritter<obi@opendreambox.org> >> --- >> meta/recipes-graphics/xorg-lib/libx11.inc | 5 ----- >> meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++ >> 2 files changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc >> b/meta/recipes-graphics/xorg-lib/libx11.inc >> index 748a48c..9057edc 100644 >> --- a/meta/recipes-graphics/xorg-lib/libx11.inc >> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc >> @@ -49,8 +49,3 @@ do_compile_prepend() { >> # Multiple libx11 derivatives from from this file and are selected >> by virtual/libx11 >> # A world build should only build the correct version, not all of them. >> EXCLUDE_FROM_WORLD = "1" >> - >> -python () { >> - if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, >> False, d): >> - raise bb.parse.SkipPackage("X11 not enabled for this >> DISTRO") >> -} >> diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc >> b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc >> index d106054..3d5d378 100644 >> --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc >> +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc >> @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" >> inherit autotools pkgconfig >> >> EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no >> --without-xmlto" >> + >> +python () { >> + whitelist = [ "pixman" ] >> + if not d.getVar('BPN', True) in whitelist and not >> oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): >> + raise bb.parse.SkipPackage("X11 not enabled for this >> DISTRO") >> +} > > Merged into OE-core > > Thanks > Sau! Thanks! You've missed v2, though. See below for an incremental patch. Regards, Andreas From ec3b779fdca465afade0f56140ab85ac4bfc9e61 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter <obi@opendreambox.org> Date: Fri, 10 Feb 2012 02:10:15 +0100 Subject: [PATCH] xorg-lib: don't build libs unless requested by DISTRO_FEATURES (fix up) * Improve error message as suggested by Koen. (This got lost when v1 was committed instead of v2) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 3d5d378..73a4d1d 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -18,5 +18,5 @@ EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" python () { whitelist = [ "pixman" ] if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") + raise bb.parse.SkipPackage("'x11' not in DISTRO_FEATURES") } -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES 2012-02-24 18:40 ` Andreas Oberritter @ 2012-02-26 11:42 ` Richard Purdie 0 siblings, 0 replies; 9+ messages in thread From: Richard Purdie @ 2012-02-26 11:42 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2012-02-24 at 19:40 +0100, Andreas Oberritter wrote: > > Merged into OE-core > > > > Thanks > > Sau! > > Thanks! You've missed v2, though. See below for an incremental patch. I've merged the fixup, thanks. Richard ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-02-26 11:53 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-10 1:27 [PATCH/RFC] xorg-lib: don't build libs unless requested by DISTRO_FEATURES Andreas Oberritter 2012-02-10 8:38 ` Koen Kooi 2012-02-10 12:19 ` Paul Eggleton 2012-02-10 12:26 ` [PATCH/RFC v2] " Andreas Oberritter 2012-02-10 12:41 ` Paul Eggleton 2012-02-10 12:42 ` Koen Kooi 2012-02-24 18:28 ` [PATCH/RFC] " Saul Wold 2012-02-24 18:40 ` Andreas Oberritter 2012-02-26 11:42 ` Richard Purdie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox