[OE-core] [bitbake-devel] [PATCH 1/1] [daisy][dizzy] data.py: fixes bad substitution when running devshell
Martin Jansa
martin.jansa at gmail.com
Fri Apr 17 00:31:50 UTC 2015
On Thu, Apr 09, 2015 at 03:21:49PM -0500, Alejandro Hernandez wrote:
> From: Richard Tollerton <rich.tollerton at ni.com>
>
> Running bitbake inside make results in the exported environment variable
> MAKEOVERRIDES="${-*-command-variables-*-}", which the shell chokes on
> when trying to expand it. But of course, it probably shouldn't have been
> trying to expand it in the first place -- so just escape the dollar
> sign.
>
> (Bitbake rev: 18cd0ce6a55c9065c3f1bf223b47d817b5efcd8f)
This was already cherry-picked to 1.24 where it IIRC breaks powertop
build with current oe-core/dizzy.
Please backport:
commit a3e9b391e1024d6d2e256b75c214d34e6693e332
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Thu Dec 18 15:54:14 2014 +0100
powertop: Fix build for !uclibc
* EXTRA_LDFLAGS isn't defined for !uclibc and configure fails
when it reads it unexpanded, see config.log snippet:
to unblock Dizzy builds and backport the same to Dylan before merging
this to 2.22.
>
> Signed-off-by: Richard Tollerton <rich.tollerton at ni.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
>
> ---
> bitbake/lib/bb/data.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
> index eb628c7..82eefef 100644
> --- a/bitbake/lib/bb/data.py
> +++ b/bitbake/lib/bb/data.py
> @@ -238,6 +238,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
> # to a shell, we need to escape the quotes in the var
> alter = re.sub('"', '\\"', val)
> alter = re.sub('\n', ' \\\n', alter)
> + alter = re.sub('\\$', '\\\\$', alter)
> o.write('%s="%s"\n' % (varExpanded, alter))
> return 0
>
> --
> 1.9.1
>
> --
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
More information about the Openembedded-core
mailing list