summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-04 15:52:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:44:07 +0000
commitcca517056bd2a195f33a7f2945df38af1a17abdd (patch)
treeef7f280631b923cedd9e8d9d5bc1fac5389caf5c /bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
parent42d1b65d1543cbb334e776bf0193ea9a8a14799e (diff)
downloadpoky-cca517056bd2a195f33a7f2945df38af1a17abdd.tar.gz
bitbake: toasterui: identify proper layer in build mode
In build mode, instead of creating our own layer objects, we identify the layer objects that the build system set up. [YOCTO #7378] (Bitbake rev: 22962b540ace6868cb357c0fd13f01ffd24449c4) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 25ce0522b5..aef9b60cba 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -180,7 +180,7 @@ class LocalhostBEController(BuildEnvironmentController):
180 base = components[-2] if components[-1] == "git" else components[-1] 180 base = components[-2] if components[-1] == "git" else components[-1]
181 181
182 if branch != "HEAD": 182 if branch != "HEAD":
183 return "_%s_%s.toaster_cloned" % (base, branch) 183 return os.path.join(self.be.sourcedir, "_%s_%s.toaster_cloned" % (base, branch))
184 184
185 185
186 # word of attention; this is a localhost-specific issue; only on the localhost we expect to have "HEAD" releases 186 # word of attention; this is a localhost-specific issue; only on the localhost we expect to have "HEAD" releases
@@ -239,7 +239,7 @@ class LocalhostBEController(BuildEnvironmentController):
239 239
240 # 3. checkout the repositories 240 # 3. checkout the repositories
241 for giturl, commit in gitrepos.keys(): 241 for giturl, commit in gitrepos.keys():
242 localdirname = os.path.join(self.be.sourcedir, self.getGitCloneDirectory(giturl, commit)) 242 localdirname = self.getGitCloneDirectory(giturl, commit)
243 logger.debug("localhostbecontroller: giturl %s:%s checking out in current directory %s" % (giturl, commit, localdirname)) 243 logger.debug("localhostbecontroller: giturl %s:%s checking out in current directory %s" % (giturl, commit, localdirname))
244 244
245 # make sure our directory is a git repository 245 # make sure our directory is a git repository