summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-05-05 14:51:19 +0800
committerChen Qi <Qi.Chen@windriver.com>2015-06-10 15:13:46 +0800
commitad1346cbfd8a0bbd3f3c958b339003169a00791b (patch)
treec55c097553fdc1b93ca92b012e24e729423ea895
parent47e7d91a824b72ade9e18a070e1ca8b7ea893ba9 (diff)
downloadopenembedded-core-contrib-ad1346cbfd8a0bbd3f3c958b339003169a00791b.tar.gz
openembedded-core-contrib-ad1346cbfd8a0bbd3f3c958b339003169a00791b.tar.bz2
openembedded-core-contrib-ad1346cbfd8a0bbd3f3c958b339003169a00791b.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>
-rw-r--r--meta/lib/oe/copy_buildsystem.py7
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')