diff options
| author | Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2015-09-07 13:42:22 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-07 16:10:59 +0100 |
| commit | 1be1db87343a48e9c25297245a2749d9df25d23c (patch) | |
| tree | fce7b43f5782c733eb94e350d3ff46982d92840d /meta/lib | |
| parent | fa708504d71e0b01ee97a172ac17ad16a9e3b897 (diff) | |
| download | openembedded-core-1be1db87343a48e9c25297245a2749d9df25d23c.tar.gz openembedded-core-1be1db87343a48e9c25297245a2749d9df25d23c.tar.bz2 openembedded-core-1be1db87343a48e9c25297245a2749d9df25d23c.zip | |
copy_buildsystem: make sure bitbake directory is copied
The previous code assumes that bitbake/ directory is under the core layer.
This is the case for Yocto project. But users might clone oe-core and bitbake
separately. So we use bb.__file__ to locate the bitbake directory to make sure
it's copied into the extensible SDK.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index cf7fada7f0..979578c41d 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py @@ -28,11 +28,10 @@ class BuildSystem(object): layers.append(corebase) corebase_files = self.d.getVar('COREBASE_FILES', True).split() - - # bitbake belongs in corebase so make sure it goes there - if "bitbake" not in corebase_files: - corebase_files.append("bitbake") corebase_files = [corebase + '/' +x for x in corebase_files] + # Make sure bitbake goes in + bitbake_dir = bb.__file__.rsplit('/', 3)[0] + corebase_files.append(bitbake_dir) for layer in layers: layerconf = os.path.join(layer, 'conf', 'layer.conf') |