[OE-core] [PATCH 1/2] devtool: modify: use B=S if that is the default for the recipe

[Paul Eggleton]

On Tuesday 21 April 2015 17:52:19 Markus Lehtonen wrote:
> Makes the build succeed for packages which do not support separate build
> directory, e.g. zlib. The same outcome could be achieved with the
> --same-dir option, but, it's generally hard to tell if a random package
> would need that option. The negative side effect of this patch is that
> dev srctree (of some packages that build fine without this modification)
> gets dirtied by build artefacts.
> 
> Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
> ---
>  scripts/lib/devtool/standard.py | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/lib/devtool/standard.py
> b/scripts/lib/devtool/standard.py index 96e3bdb..1c1bce8 100644
> --- a/scripts/lib/devtool/standard.py
> +++ b/scripts/lib/devtool/standard.py
> @@ -391,12 +391,19 @@ def modify(args, config, basepath, workspace):
>          f.write('inherit externalsrc\n')
>          f.write('# NOTE: We use pn- overrides here to avoid affecting
> multiple variants in the case where the recipe uses BBCLASSEXTEND\n')
> f.write('EXTERNALSRC_pn-%s = "%s"\n' % (args.recipename, srctree)) -       
> if args.same_dir or bb.data.inherits_class('autotools-brokensep', rd): -   
>         if args.same_dir:
> -                logger.info('using source tree as build directory since
> --same-dir specified') -            else:
> -                logger.info('using source tree as build directory since
> original recipe inherits autotools-brokensep') +
> +        b_is_s = True
> +        if args.same_dir:
> +            logger.info('using source tree as build directory since
> --same-dir specified') +        elif
> bb.data.inherits_class('autotools-brokensep', rd):
> +            logger.info('using source tree as build directory since
> original recipe inherits autotools-brokensep') +        elif rd.getVar('B',
> True) == s:
> +            logger.info('using source tree as build directory since that is
> the default for this recipe') +        else:
> +            b_is_s = False
> +        if b_is_s:
>              f.write('EXTERNALSRC_BUILD_pn-%s = "%s"\n' % (args.recipename,
> srctree)) +
>          if initial_rev:
>              f.write('\n# initial_rev: %s\n' % initial_rev)
>              for commit in commits:

Both this and 2/2 look good to me.

Acked-by: Paul Eggleton <paul.eggleton at linux.intel.com>

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre