From: Richard Purdie <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
Signed-off-by: Elizabeth Flanagan <[email protected]>
---
.../buildbot/steps/source/yoctogit.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git
a/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
b/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
index 446631d..64dfe06 100644
---
a/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
+++
b/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
@@ -246,10 +246,17 @@ class YoctoGit(Source):
log.msg("Source step failed while running command %s" % cmd)
raise buildstep.BuildStepFailed()
d.addCallback(lambda _: evaluateCommand(cmd))
+ if self.mirrordir:
+ mirror = self.mirrordir + "/" + self.repourl.replace("git://", "")
+ "/"
+ if self.pathExists(mirror):
+ self.srcdir=mirror
+ else:
+ self.srcdir='source/'+self.repourl
+ if self.layername == "poky" or self.layername == "oecore" or "eclipse"
in self.layername:
+ self.todir = "build/"
+ else:
+ self.todir = "build/" + self.layername
- self.workdir = 'source/'+self.repourl
- self.srcdir='source/'+self.repourl
- self.todir = "build/" + self.layername
d.addCallback(lambda _: self.incremental())
def copy(_):
cmd = buildstep.RemoteCommand('cpdir',
@@ -465,8 +472,6 @@ class YoctoGit(Source):
args += ['--depth', '1']
command = ['clone'] + args + [self.repourl, '.']
- import os
-
mirror = None
if self.mirrordir:
mirror = self.mirrordir + "/" + self.repourl.replace("git://", "")
+ "/"
--
1.8.1.2
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
