diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-03-02 17:59:38 +0000 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-03-14 17:41:46 -0700 |
commit | 5c0a84fd9554929af3ac859b512c3127ead89cdd (patch) | |
tree | 4fe2b6b42ff734a8c6ea624cb04742e60a75e4da /bitbake/bin/bitbake-layers | |
parent | abcec8015c29c4322405e0e71ed05cb74d441cde (diff) | |
download | poky-5c0a84fd9554929af3ac859b512c3127ead89cdd.tar.gz |
bitbake/bitbake-layers: fix to run with recent changes
This patch marks the bitbake-layers script as executable and fixes the
instantiation of the BBCooker to match recent changes in the BitBake
libraries.
I've also added a brief header which demonstrates the intent and usage
as taken from Chris Larson's original commit message.
Note: this fix is not upstreamable, it's only required in Poky because of an
outstanding difference between BitBake master and Poky's BitBake.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'bitbake/bin/bitbake-layers')
-rwxr-xr-x[-rw-r--r--] | bitbake/bin/bitbake-layers | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index ea903e5c9b..b6106cd075 100644..100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
@@ -1,5 +1,11 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
2 | 2 | ||
3 | # This script has subcommands which operate against your bitbake layers, either | ||
4 | # displaying useful information, or acting against them. | ||
5 | # Currently, it only provides a show_appends command, which shows you what | ||
6 | # bbappends are in effect, and warns you if you have appends which are not being | ||
7 | # utilized. | ||
8 | |||
3 | import cmd | 9 | import cmd |
4 | import logging | 10 | import logging |
5 | import os.path | 11 | import os.path |
@@ -13,6 +19,7 @@ import bb.cache | |||
13 | import bb.cooker | 19 | import bb.cooker |
14 | import bb.providers | 20 | import bb.providers |
15 | from bb.cooker import state | 21 | from bb.cooker import state |
22 | from bb.server import none | ||
16 | 23 | ||
17 | 24 | ||
18 | logger = logging.getLogger('BitBake') | 25 | logger = logging.getLogger('BitBake') |
@@ -38,14 +45,11 @@ class Commands(cmd.Cmd): | |||
38 | self.returncode = 0 | 45 | self.returncode = 0 |
39 | self.config = Config(parse_only=True) | 46 | self.config = Config(parse_only=True) |
40 | self.cooker = bb.cooker.BBCooker(self.config, | 47 | self.cooker = bb.cooker.BBCooker(self.config, |
41 | self.register_idle_function) | 48 | bb.server.none) |
42 | self.config_data = self.cooker.configuration.data | 49 | self.config_data = self.cooker.configuration.data |
43 | bb.providers.logger.setLevel(logging.ERROR) | 50 | bb.providers.logger.setLevel(logging.ERROR) |
44 | self.prepare_cooker() | 51 | self.prepare_cooker() |
45 | 52 | ||
46 | def register_idle_function(self, function, data): | ||
47 | pass | ||
48 | |||
49 | def prepare_cooker(self): | 53 | def prepare_cooker(self): |
50 | sys.stderr.write("Parsing recipes..") | 54 | sys.stderr.write("Parsing recipes..") |
51 | logger.setLevel(logging.ERROR) | 55 | logger.setLevel(logging.ERROR) |