|
@@ -45,6 +45,8 @@ class Repo(FetchMethod):
|
|
|
"master".
|
|
|
"""
|
|
|
|
|
|
+ ud.basecmd = d.getVar("FETCHCMD_repo") or "/usr/bin/env repo"
|
|
|
+
|
|
|
ud.proto = ud.parm.get('protocol', 'git')
|
|
|
ud.branch = ud.parm.get('branch', 'master')
|
|
|
ud.manifest = ud.parm.get('manifest', 'default.xml')
|
|
@@ -60,8 +62,8 @@ class Repo(FetchMethod):
|
|
|
logger.debug(1, "%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath)
|
|
|
return
|
|
|
|
|
|
+ repodir = d.getVar("REPODIR") or (d.getVar("DL_DIR") + "/repo")
|
|
|
gitsrcname = "%s%s" % (ud.host, ud.path.replace("/", "."))
|
|
|
- repodir = d.getVar("REPODIR") or os.path.join(d.getVar("DL_DIR"), "repo")
|
|
|
codir = os.path.join(repodir, gitsrcname, ud.manifest)
|
|
|
|
|
|
if ud.user:
|
|
@@ -72,11 +74,11 @@ class Repo(FetchMethod):
|
|
|
repodir = os.path.join(codir, "repo")
|
|
|
bb.utils.mkdirhier(repodir)
|
|
|
if not os.path.exists(os.path.join(repodir, ".repo")):
|
|
|
- bb.fetch2.check_network_access(d, "repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), ud.url)
|
|
|
- runfetchcmd("repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), d, workdir=repodir)
|
|
|
+ bb.fetch2.check_network_access(d, "%s init -m %s -b %s -u %s://%s%s%s" % (ud.basecmd, ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), ud.url)
|
|
|
+ runfetchcmd("%s init -m %s -b %s -u %s://%s%s%s" % (ud.basecmd, ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), d, workdir=repodir)
|
|
|
|
|
|
- bb.fetch2.check_network_access(d, "repo sync %s" % ud.url, ud.url)
|
|
|
- runfetchcmd("repo sync", d, workdir=repodir)
|
|
|
+ bb.fetch2.check_network_access(d, "%s sync %s" % (ud.basecmd, ud.url), ud.url)
|
|
|
+ runfetchcmd("%s sync" % ud.basecmd, d, workdir=repodir)
|
|
|
|
|
|
scmdata = ud.parm.get("scmdata", "")
|
|
|
if scmdata == "keep":
|