[oe-commits] Qi.Chen at windriver.com : copy_buildsystem: make sure bitbake directory is copied
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 9 13:53:06 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 1be1db87343a48e9c25297245a2749d9df25d23c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1be1db87343a48e9c25297245a2749d9df25d23c
Author: Qi.Chen at windriver.com <Qi.Chen at windriver.com>
Date: Mon Sep 7 13:42:22 2015 +0100
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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/copy_buildsystem.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index cf7fada..979578c 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')
More information about the Openembedded-commits
mailing list