We're removing srcdir from yoctogit.py. It causes way too many
issues.
Signed-off-by: Elizabeth Flanagan <[email protected]>
---
lib/python2.7/site-packages/autobuilder/BuildSet.py | 2 --
lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py | 5 ++---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/python2.7/site-packages/autobuilder/BuildSet.py
b/lib/python2.7/site-packages/autobuilder/BuildSet.py
index ab7b0bb..4bcda66 100644
--- a/lib/python2.7/site-packages/autobuilder/BuildSet.py
+++ b/lib/python2.7/site-packages/autobuilder/BuildSet.py
@@ -73,7 +73,6 @@ class BuildSet():
mirrordir=None
method = 'clobber'
mode='full'
- srcdir = 'source'
if str(os.environ.get('OPTIMIZED_GIT_CLONE')) ==
"True":
if 'poky' in layername or 'oecore' in
layername or 'eclipse' in layername:
method='movecopy'
@@ -93,7 +92,6 @@ class BuildSet():
func = getattr(m, step)
factoryFN(func(locals()['f'+name],
layername=layername,
- srcdir=srcdir,
mode=mode,
scheduler=name,
method=method,
diff --git
a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
index 5e95189..029b523 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
@@ -35,12 +35,11 @@ from buildbot.process import buildstep
class CheckOutLayers(YoctoGit):
def __init__(self, factory, scheduler=None, layername=None, mode='full',
storedir=None, mirrordir=None,
- method='clobber', submodules=False, shallow=False,
srcdir='source', workdir='build',
+ method='clobber', submodules=False, shallow=False,
workdir='build',
timeout=100000, progress=True, retryFetch=True,
clobberOnFailure=False,
getDescription=True, argdict=None,
**kwargs):
self.scheduler = scheduler
- self.srcdir=srcdir
self.workdir=workdir
self.branch = ""
self.commit = ""
@@ -63,7 +62,7 @@ class CheckOutLayers(YoctoGit):
for k, v in argdict.iteritems():
setattr(self, k, v)
YoctoGit.__init__(self, repourl=self.repourl, branch=self.branch,
mode=self.mode,
- method=self.method, storedir=self.storedir,
mirrordir=mirrordir, submodules=self.submodules,
srcdir=self.srcdir+"/"+self.repourl,
+ method=self.method, storedir=self.storedir,
mirrordir=mirrordir, submodules=self.submodules,
workdir=self.workdir, shallow=self.shallow,
progress=self.progress,
retryFetch=self.retryFetch,
clobberOnFailure=self.clobberOnFailure,
getDescription=self.getDescription, layername=self.layername,
**kwargs)
--
1.8.1.2
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
