summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-07-25 18:29:53 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-26 12:46:32 (GMT)
commit0828e6c481ffdf67e1d893025f2233ac6a4b0b46 (patch)
tree53055c2397cf4e9be938708c7b38d82f6b18f870 /bitbake/bin
parent50016106ad1e165a60639bfbc7b31e9c66ae5474 (diff)
downloadpoky-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>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake-layers7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index 3d563b5..d9f95d1 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -8,7 +8,7 @@
8 8
9import cmd 9import cmd
10import logging 10import logging
11import os.path 11import os
12import sys 12import sys
13 13
14bindir = os.path.dirname(__file__) 14bindir = os.path.dirname(__file__)
@@ -41,11 +41,12 @@ def main(args):
41class Commands(cmd.Cmd): 41class 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