* Richard Purdie <[email protected]> [110817 16:09]: > On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote: > > When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui > > -nomake tools > > -nomake examples -nomake demos -nomake docs', build failure can occur, due > > to not building > > all tools. > > > > * Make rm not error out when removing one of the, possibly, non-existing > > tools. > > * Only try to rename qtdemo, if qtdemo exists. > > * Guard do_split_packages() with an try-except-clause, otherwise we get an > > error stating > > that .../phrasebooks/... do not exist. > > > > Signed-off-by: Anders Darander <[email protected]> > > --- > > meta/recipes-qt/qt4/qt4.inc | 13 ++++++++----- > > 1 files changed, 8 insertions(+), 5 deletions(-) > > > > diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc > > index 0410a92..994ec12 100644 > > --- a/meta/recipes-qt/qt4/qt4.inc > > +++ b/meta/recipes-qt/qt4/qt4.inc > > @@ -227,7 +227,10 @@ python populate_packages_prepend() { > > > > phrasebook_dir = > > bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) > > phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', > > d) > > - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', > > phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) > > + try: > > + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', > > phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) > > + except: > > + pass
> Please use some actual test here, not a general try/except/pass. This > reason is that is some failure we want to know about happens, this will > hide it as the code stands. Yes, that's right. Initially I had a plan to get some ideas on how to tackle this, but I think I've got a good test outlined. Hopefully I can implement and test it tonight, otherwise I'll do it tomorrow. Cheers, Anders -- Anders Darander ChargeStorm AB _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
