diff options
| l--------- | bitbake/bin/bitbake-config-build | 1 | ||||
| -rwxr-xr-x | bitbake/bin/bitbake-layers | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake-config-build b/bitbake/bin/bitbake-config-build new file mode 120000 index 0000000000..11e6df80c4 --- /dev/null +++ b/bitbake/bin/bitbake-config-build | |||
| @@ -0,0 +1 @@ | |||
| bitbake-layers \ No newline at end of file | |||
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 7bd3ea20e4..341ecbcd97 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
| @@ -18,13 +18,14 @@ import warnings | |||
| 18 | warnings.simplefilter("default") | 18 | warnings.simplefilter("default") |
| 19 | 19 | ||
| 20 | bindir = os.path.dirname(__file__) | 20 | bindir = os.path.dirname(__file__) |
| 21 | toolname = os.path.basename(__file__).split(".")[0] | ||
| 21 | topdir = os.path.dirname(bindir) | 22 | topdir = os.path.dirname(bindir) |
| 22 | sys.path[0:0] = [os.path.join(topdir, 'lib')] | 23 | sys.path[0:0] = [os.path.join(topdir, 'lib')] |
| 23 | 24 | ||
| 24 | import bb.tinfoil | 25 | import bb.tinfoil |
| 25 | import bb.msg | 26 | import bb.msg |
| 26 | 27 | ||
| 27 | logger = bb.msg.logger_create('bitbake-layers', sys.stdout) | 28 | logger = bb.msg.logger_create(toolname, sys.stdout) |
| 28 | 29 | ||
| 29 | def main(): | 30 | def main(): |
| 30 | parser = argparse.ArgumentParser( | 31 | parser = argparse.ArgumentParser( |
| @@ -67,7 +68,8 @@ def main(): | |||
| 67 | bbpaths = tinfoil.config_data.getVar('BBPATH').split(':') | 68 | bbpaths = tinfoil.config_data.getVar('BBPATH').split(':') |
| 68 | 69 | ||
| 69 | for path in ([topdir] + bbpaths): | 70 | for path in ([topdir] + bbpaths): |
| 70 | pluginpath = os.path.join(path, 'lib', 'bblayers') | 71 | pluginbasepath = {"bitbake-layers":'bblayers', 'bitbake-config-build':'bbconfigbuild'}[toolname] |
| 72 | pluginpath = os.path.join(path, 'lib', pluginbasepath) | ||
| 71 | bb.utils.load_plugins(logger, plugins, pluginpath) | 73 | bb.utils.load_plugins(logger, plugins, pluginpath) |
| 72 | 74 | ||
| 73 | registered = False | 75 | registered = False |
