diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-07-25 11:29:53 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-26 13:46:32 +0100 |
commit | 0828e6c481ffdf67e1d893025f2233ac6a4b0b46 (patch) | |
tree | 53055c2397cf4e9be938708c7b38d82f6b18f870 | |
parent | 50016106ad1e165a60639bfbc7b31e9c66ae5474 (diff) | |
download | poky-0828e6c481ffdf67e1d893025f2233ac6a4b0b46.tar.gz |
bitbake-layers: adapt to cooker change for saved environment
The Cooker requires a copy of the environment mapping, modify
bitbake-layers to take one and pass it to the cooker.
(Bitbake rev: f5653e557b68a27e99a2a6a5c5a31d0ba0b56bcb)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bitbake/bin/bitbake-layers | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 3d563b5fca..d9f95d1e01 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | import cmd | 9 | import cmd |
10 | import logging | 10 | import logging |
11 | import os.path | 11 | import os |
12 | import sys | 12 | import sys |
13 | 13 | ||
14 | bindir = os.path.dirname(__file__) | 14 | bindir = os.path.dirname(__file__) |
@@ -41,11 +41,12 @@ def main(args): | |||
41 | class Commands(cmd.Cmd): | 41 | class Commands(cmd.Cmd): |
42 | def __init__(self): | 42 | def __init__(self): |
43 | cmd.Cmd.__init__(self) | 43 | cmd.Cmd.__init__(self) |
44 | 44 | initialenv = os.environ.copy() | |
45 | self.returncode = 0 | 45 | self.returncode = 0 |
46 | self.config = Config(parse_only=True) | 46 | self.config = Config(parse_only=True) |
47 | self.cooker = bb.cooker.BBCooker(self.config, | 47 | self.cooker = bb.cooker.BBCooker(self.config, |
48 | self.register_idle_function) | 48 | self.register_idle_function, |
49 | initialenv) | ||
49 | self.config_data = self.cooker.configuration.data | 50 | self.config_data = self.cooker.configuration.data |
50 | bb.providers.logger.setLevel(logging.ERROR) | 51 | bb.providers.logger.setLevel(logging.ERROR) |
51 | self.cooker_data = None | 52 | self.cooker_data = None |