diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-19 21:52:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:05:14 +0100 |
commit | 7ad49364fd58c8c447727d234ff0597e43dac20d (patch) | |
tree | 592f868e759e17b639d19f21c2c27004e7929345 | |
parent | 0816a3f35534dd8c935b72f4329bc21c5588201f (diff) | |
download | poky-7ad49364fd58c8c447727d234ff0597e43dac20d.tar.gz |
utils.bbclass: Testing via env in create_wrapper is a nice idea but breaks things
For example, pseudo-native wants to set LD_LIBRBARY_PATH but setting this
into the environment here causes the existing pseudo (running during do_install)
to poke into paths in /opt and this breaks builds.
The simplest fix is simply not to do this. Comments tweaks to match the code.
(From OE-Core rev: 1efa999ed02186c9c58cb48418e0c62ecdc82ac7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/utils.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 3b5946308c..fde8f446ad 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass | |||
@@ -282,7 +282,6 @@ create_cmdline_wrapper () { | |||
282 | cmd=$1 | 282 | cmd=$1 |
283 | shift | 283 | shift |
284 | 284 | ||
285 | # run echo via env to test syntactic validity of the variable arguments | ||
286 | echo "Generating wrapper script for $cmd" | 285 | echo "Generating wrapper script for $cmd" |
287 | 286 | ||
288 | mv $cmd $cmd.real | 287 | mv $cmd $cmd.real |
@@ -306,8 +305,7 @@ create_wrapper () { | |||
306 | cmd=$1 | 305 | cmd=$1 |
307 | shift | 306 | shift |
308 | 307 | ||
309 | # run echo via env to test syntactic validity of the variable arguments | 308 | echo "Generating wrapper script for $cmd" |
310 | env $@ echo "Generating wrapper script for $cmd" | ||
311 | 309 | ||
312 | mv $cmd $cmd.real | 310 | mv $cmd $cmd.real |
313 | cmdname=`basename $cmd`.real | 311 | cmdname=`basename $cmd`.real |