summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi.Chen@windriver.com <Qi.Chen@windriver.com>2015-09-07 13:42:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:41 +0100
commitd7efdfeb5bf3c942feb152874d686560509ece5b (patch)
tree61c4556aaf74cb14f5b2bb2320692f6ecfdcc671
parent479deeb3f12bf638d7d4bf80d17bd99919847152 (diff)
downloadpoky-d7efdfeb5bf3c942feb152874d686560509ece5b.tar.gz
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. (From OE-Core rev: 1be1db87343a48e9c25297245a2749d9df25d23c) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
28 layers.append(corebase) 28 layers.append(corebase)
29 29
30 corebase_files = self.d.getVar('COREBASE_FILES', True).split() 30 corebase_files = self.d.getVar('COREBASE_FILES', True).split()
31
32 # bitbake belongs in corebase so make sure it goes there
33 if "bitbake" not in corebase_files:
34 corebase_files.append("bitbake")
35 corebase_files = [corebase + '/' +x for x in corebase_files] 31 corebase_files = [corebase + '/' +x for x in corebase_files]
32 # Make sure bitbake goes in
33 bitbake_dir = bb.__file__.rsplit('/', 3)[0]
34 corebase_files.append(bitbake_dir)
36 35
37 for layer in layers: 36 for layer in layers:
38 layerconf = os.path.join(layer, 'conf', 'layer.conf') 37 layerconf = os.path.join(layer, 'conf', 'layer.conf')