[OE-core] [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time

[Richard Purdie]

On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Anders Darander <anders at chargestorm.se>
> 
> 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.
> * Check if the phrasebook path exists, and only then call do_split_packages()
> 
> Signed-off-by: Anders Darander <anders at chargestorm.se>
> ---
>  meta/recipes-qt/qt4/qt4.inc |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 0410a92..5545be7 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -227,10 +227,11 @@ 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='' )
> +        import os;
> +        if os.path.exists(phrasebook_dir):
> +                do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
>   
>          # Package all the plugins and their -dbg version and create a meta package
> -        import os

For reference, BitBake assumes that both os and bb are always imported
so we can likely drop all "import os" references. I'll take this patch
since its harmless but I did just grep the classes directory and it
looks like we can clean up those imports a little.

Cheers,

Richard