On Thu, Jul 30, 2015 at 8:18 AM, Robert Yang <liezhi.y...@windriver.com> wrote: > The FOO[doc] is set in meta/conf/documentation.conf, we need remove it > from d.getVarFlags()'s return dict when it causes many loops. > > Signed-off-by: Robert Yang <liezhi.y...@windriver.com> > --- > meta/classes/base.bbclass | 2 ++ > meta/classes/blacklist.bbclass | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index b7e22ad..9e33f44 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -336,6 +336,8 @@ python () { > # PACKAGECONFIG ??= "<default options>" > # PACKAGECONFIG[foo] = > "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends" > pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} > + # Remove PACKAGECONFIG[doc] > + pkgconfigflags.pop('doc', None)
This change breaks recipes which try to use 'doc' as a PACKAGECONFIG option. Nothing in oe-core tries to do that, but there are recipes in other layers which do (e.g. efl in meta-oe and lxc in meta-virtualization). Could this change we reworked somehow to allow 'doc' to continue to be used as a PACKAGECONFIG option (as it is in fido)? > if pkgconfigflags: > pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() > pn = d.getVar("PN", True) > diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass > index a0141a8..39b3f82 100644 > --- a/meta/classes/blacklist.bbclass > +++ b/meta/classes/blacklist.bbclass > @@ -28,6 +28,8 @@ python blacklist_multilib_eventhandler() { > prefixes.append(eext[1]) > > blacklists = e.data.getVarFlags('PNBLACKLIST') or {} > + # Remove PNBLACKLIST[doc] > + blacklists.pop('doc', None) > for pkg, reason in blacklists.items(): > if pkg.endswith(("-native", "-crosssdk")) or > pkg.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in > pkg: > continue > -- > 1.7.9.5 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core