sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: fetch2: preserve current working directory 

Fix the methods in all fetchers so they don't change
the current working directory of the calling process, which
could lead to "changed cwd" warnings from bitbake.

(Bitbake rev: 6aa78bf3bd1f75728209e2d01faef31cb8887333)

Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Matt Madison 2016-08-10 10:08:16 -07:00 committed by Richard Purdie
parent eefb4b66c8
commit ab09541d55
13 changed files with 101 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bitbake/lib/bb/fetch2/__init__.py
View File

@ -779,7 +779,7 @@ def localpath(url, d):
fetcher = bb.fetch2.Fetch([url], d) fetcher = bb.fetch2.Fetch([url], d)
return fetcher.localpath(url) return fetcher.localpath(url)
def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None): def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None):
""" """
Run cmd returning the command output Run cmd returning the command output
Raise an error if interrupted or cmd fails Raise an error if interrupted or cmd fails
@ -821,7 +821,7 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None):
error_message = "" error_message = ""
try: try:
(output, errors) = bb.process.run(cmd, log=log, shell=True, stderr=subprocess.PIPE) (output, errors) = bb.process.run(cmd, log=log, shell=True, stderr=subprocess.PIPE, cwd=workdir)
success = True success = True
except bb.process.NotFoundError as e: except bb.process.NotFoundError as e:
error_message = "Fetch command %s" % (e.command) error_message = "Fetch command %s" % (e.command)
@ -1436,17 +1436,11 @@ class FetchMethod(object):
if not cmd: if not cmd:
return return
# Change to unpackdir before executing command
save_cwd = os.getcwd();
os.chdir(unpackdir)
path = data.getVar('PATH', True) path = data.getVar('PATH', True)
if path: if path:
cmd = "PATH=\"%s\" %s" % (path, cmd) cmd = "PATH=\"%s\" %s" % (path, cmd)
bb.note("Unpacking %s to %s/" % (file, os.getcwd())) bb.note("Unpacking %s to %s/" % (file, unpackdir))
ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True) ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True, cwd=unpackdir)
os.chdir(save_cwd)
if ret != 0: if ret != 0:
raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), urldata.url) raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), urldata.url)
@ -1559,6 +1553,8 @@ class Fetch(object):
network = self.d.getVar("BB_NO_NETWORK", True) network = self.d.getVar("BB_NO_NETWORK", True)
premirroronly = (self.d.getVar("BB_FETCH_PREMIRRORONLY", True) == "1") premirroronly = (self.d.getVar("BB_FETCH_PREMIRRORONLY", True) == "1")
save_cwd = os.getcwd()
for u in urls: for u in urls:
ud = self.ud[u] ud = self.ud[u]
ud.setup_localpath(self.d) ud.setup_localpath(self.d)
@ -1633,6 +1629,7 @@ class Fetch(object):
raise raise
finally: finally:
os.chdir(save_cwd)
if ud.lockfile: if ud.lockfile:
bb.utils.unlockfile(lf) bb.utils.unlockfile(lf)
@ -1641,6 +1638,8 @@ class Fetch(object):
Check all urls exist upstream Check all urls exist upstream
""" """
save_cwd = os.getcwd()
if not urls: if not urls:
urls = self.urls urls = self.urls
@ -1664,6 +1663,8 @@ class Fetch(object):
if not ret: if not ret:
raise FetchError("URL %s doesn't work" % u, u) raise FetchError("URL %s doesn't work" % u, u)
os.chdir(save_cwd)
def unpack(self, root, urls=None): def unpack(self, root, urls=None):
""" """
Check all urls exist upstream Check all urls exist upstream

11
bitbake/lib/bb/fetch2/bzr.py
View File

@ -88,19 +88,15 @@ class Bzr(FetchMethod):
bzrcmd = self._buildbzrcommand(ud, d, "update") bzrcmd = self._buildbzrcommand(ud, d, "update")
logger.debug(1, "BZR Update %s", ud.url) logger.debug(1, "BZR Update %s", ud.url)
bb.fetch2.check_network_access(d, bzrcmd, ud.url) bb.fetch2.check_network_access(d, bzrcmd, ud.url)
os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path))) runfetchcmd(bzrcmd, d, workdir=os.path.join(ud.pkgdir, os.path.basename(ud.path)))
runfetchcmd(bzrcmd, d)
else: else:
bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True)
bzrcmd = self._buildbzrcommand(ud, d, "fetch") bzrcmd = self._buildbzrcommand(ud, d, "fetch")
bb.fetch2.check_network_access(d, bzrcmd, ud.url) bb.fetch2.check_network_access(d, bzrcmd, ud.url)
logger.debug(1, "BZR Checkout %s", ud.url) logger.debug(1, "BZR Checkout %s", ud.url)
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir)
logger.debug(1, "Running %s", bzrcmd) logger.debug(1, "Running %s", bzrcmd)
runfetchcmd(bzrcmd, d) runfetchcmd(bzrcmd, d, workdir=ud.pkgdir)
os.chdir(ud.pkgdir)
scmdata = ud.parm.get("scmdata", "") scmdata = ud.parm.get("scmdata", "")
if scmdata == "keep": if scmdata == "keep":
@ -109,7 +105,8 @@ class Bzr(FetchMethod):
tar_flags = "--exclude='.bzr' --exclude='.bzrtags'" tar_flags = "--exclude='.bzr' --exclude='.bzrtags'"
# tar them up to a defined filename # tar them up to a defined filename
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), d, cleanup = [ud.localpath]) runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)),
d, cleanup=[ud.localpath], workdir=ud.pkgdir)
def supports_srcrev(self): def supports_srcrev(self):
return True return True

6
bitbake/lib/bb/fetch2/clearcase.py
View File

@ -202,11 +202,10 @@ class ClearCase(FetchMethod):
def _remove_view(self, ud, d): def _remove_view(self, ud, d):
if os.path.exists(ud.viewdir): if os.path.exists(ud.viewdir):
os.chdir(ud.ccasedir)
cmd = self._build_ccase_command(ud, 'rmview'); cmd = self._build_ccase_command(ud, 'rmview');
logger.info("cleaning up [VOB=%s label=%s view=%s]", ud.vob, ud.label, ud.viewname) logger.info("cleaning up [VOB=%s label=%s view=%s]", ud.vob, ud.label, ud.viewname)
bb.fetch2.check_network_access(d, cmd, ud.url) bb.fetch2.check_network_access(d, cmd, ud.url)
output = runfetchcmd(cmd, d) output = runfetchcmd(cmd, d, workdir=ud.ccasedir)
logger.info("rmview output: %s", output) logger.info("rmview output: %s", output)
def need_update(self, ud, d): def need_update(self, ud, d):
@ -241,11 +240,10 @@ class ClearCase(FetchMethod):
raise e raise e
# Set configspec: Setting the configspec effectively fetches the files as defined in the configspec # Set configspec: Setting the configspec effectively fetches the files as defined in the configspec
os.chdir(ud.viewdir)
cmd = self._build_ccase_command(ud, 'setcs'); cmd = self._build_ccase_command(ud, 'setcs');
logger.info("fetching data [VOB=%s label=%s view=%s]", ud.vob, ud.label, ud.viewname) logger.info("fetching data [VOB=%s label=%s view=%s]", ud.vob, ud.label, ud.viewname)
bb.fetch2.check_network_access(d, cmd, ud.url) bb.fetch2.check_network_access(d, cmd, ud.url)
output = runfetchcmd(cmd, d) output = runfetchcmd(cmd, d, workdir=ud.viewdir)
logger.info("%s", output) logger.info("%s", output)
# Copy the configspec to the viewdir so we have it in our source tarball later # Copy the configspec to the viewdir so we have it in our source tarball later

15
bitbake/lib/bb/fetch2/cvs.py
View File

@ -123,22 +123,23 @@ class Cvs(FetchMethod):
pkg = d.getVar('PN', True) pkg = d.getVar('PN', True)
pkgdir = os.path.join(d.getVar('CVSDIR', True), pkg) pkgdir = os.path.join(d.getVar('CVSDIR', True), pkg)
moddir = os.path.join(pkgdir, localdir) moddir = os.path.join(pkgdir, localdir)
workdir = None
if os.access(os.path.join(moddir, 'CVS'), os.R_OK): if os.access(os.path.join(moddir, 'CVS'), os.R_OK):
logger.info("Update " + ud.url) logger.info("Update " + ud.url)
bb.fetch2.check_network_access(d, cvsupdatecmd, ud.url) bb.fetch2.check_network_access(d, cvsupdatecmd, ud.url)
# update sources there # update sources there
os.chdir(moddir) workdir = moddir
cmd = cvsupdatecmd cmd = cvsupdatecmd
else: else:
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(pkgdir) bb.utils.mkdirhier(pkgdir)
os.chdir(pkgdir) workdir = pkgdir
logger.debug(1, "Running %s", cvscmd) logger.debug(1, "Running %s", cvscmd)
bb.fetch2.check_network_access(d, cvscmd, ud.url) bb.fetch2.check_network_access(d, cvscmd, ud.url)
cmd = cvscmd cmd = cvscmd
runfetchcmd(cmd, d, cleanup = [moddir]) runfetchcmd(cmd, d, cleanup=[moddir], workdir=workdir)
if not os.access(moddir, os.R_OK): if not os.access(moddir, os.R_OK):
raise FetchError("Directory %s was not readable despite sucessful fetch?!" % moddir, ud.url) raise FetchError("Directory %s was not readable despite sucessful fetch?!" % moddir, ud.url)
@ -150,15 +151,15 @@ class Cvs(FetchMethod):
tar_flags = "--exclude='CVS'" tar_flags = "--exclude='CVS'"
# tar them up to a defined filename # tar them up to a defined filename
workdir = None
if 'fullpath' in ud.parm: if 'fullpath' in ud.parm:
os.chdir(pkgdir) workdir = pkgdir
cmd = "tar %s -czf %s %s" % (tar_flags, ud.localpath, localdir) cmd = "tar %s -czf %s %s" % (tar_flags, ud.localpath, localdir)
else: else:
os.chdir(moddir) workdir = os.path.dirname(os.path.realpath(moddir))
os.chdir('..')
cmd = "tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(moddir)) cmd = "tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(moddir))
runfetchcmd(cmd, d, cleanup = [ud.localpath]) runfetchcmd(cmd, d, cleanup=[ud.localpath], workdir=workdir)
def clean(self, ud, d): def clean(self, ud, d):
""" Clean CVS Files and tarballs """ """ Clean CVS Files and tarballs """

45
bitbake/lib/bb/fetch2/git.py
View File

@ -219,9 +219,8 @@ class Git(FetchMethod):
def need_update(self, ud, d): def need_update(self, ud, d):
if not os.path.exists(ud.clonedir): if not os.path.exists(ud.clonedir):
return True return True
os.chdir(ud.clonedir)
for name in ud.names: for name in ud.names:
if not self._contains_ref(ud, d, name): if not self._contains_ref(ud, d, name, ud.clonedir):
return True return True
if ud.write_tarballs and not os.path.exists(ud.fullmirror): if ud.write_tarballs and not os.path.exists(ud.fullmirror):
return True return True
@ -242,8 +241,7 @@ class Git(FetchMethod):
# If the checkout doesn't exist and the mirror tarball does, extract it # If the checkout doesn't exist and the mirror tarball does, extract it
if not os.path.exists(ud.clonedir) and os.path.exists(ud.fullmirror): if not os.path.exists(ud.clonedir) and os.path.exists(ud.fullmirror):
bb.utils.mkdirhier(ud.clonedir) bb.utils.mkdirhier(ud.clonedir)
os.chdir(ud.clonedir) runfetchcmd("tar -xzf %s" % (ud.fullmirror), d, workdir=ud.clonedir)
runfetchcmd("tar -xzf %s" % (ud.fullmirror), d)
repourl = self._get_repo_url(ud) repourl = self._get_repo_url(ud)
@ -258,34 +256,32 @@ class Git(FetchMethod):
progresshandler = GitProgressHandler(d) progresshandler = GitProgressHandler(d)
runfetchcmd(clone_cmd, d, log=progresshandler) runfetchcmd(clone_cmd, d, log=progresshandler)
os.chdir(ud.clonedir)
# Update the checkout if needed # Update the checkout if needed
needupdate = False needupdate = False
for name in ud.names: for name in ud.names:
if not self._contains_ref(ud, d, name): if not self._contains_ref(ud, d, name, ud.clonedir):
needupdate = True needupdate = True
if needupdate: if needupdate:
try: try:
runfetchcmd("%s remote rm origin" % ud.basecmd, d) runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
except bb.fetch2.FetchError: except bb.fetch2.FetchError:
logger.debug(1, "No Origin") logger.debug(1, "No Origin")
runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d) runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir)
fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl) fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl)
if ud.proto.lower() != 'file': if ud.proto.lower() != 'file':
bb.fetch2.check_network_access(d, fetch_cmd, ud.url) bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
progresshandler = GitProgressHandler(d) progresshandler = GitProgressHandler(d)
runfetchcmd(fetch_cmd, d, log=progresshandler) runfetchcmd(fetch_cmd, d, log=progresshandler, workdir=ud.clonedir)
runfetchcmd("%s prune-packed" % ud.basecmd, d) runfetchcmd("%s prune-packed" % ud.basecmd, d, workdir=ud.clonedir)
runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d) runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d, workdir=ud.clonedir)
try: try:
os.unlink(ud.fullmirror) os.unlink(ud.fullmirror)
except OSError as exc: except OSError as exc:
if exc.errno != errno.ENOENT: if exc.errno != errno.ENOENT:
raise raise
os.chdir(ud.clonedir)
for name in ud.names: for name in ud.names:
if not self._contains_ref(ud, d, name): if not self._contains_ref(ud, d, name, ud.clonedir):
raise bb.fetch2.FetchError("Unable to find revision %s in branch %s even from upstream" % (ud.revisions[name], ud.branches[name])) raise bb.fetch2.FetchError("Unable to find revision %s in branch %s even from upstream" % (ud.revisions[name], ud.branches[name]))
def build_mirror_data(self, ud, d): def build_mirror_data(self, ud, d):
@ -295,10 +291,9 @@ class Git(FetchMethod):
if os.path.islink(ud.fullmirror): if os.path.islink(ud.fullmirror):
os.unlink(ud.fullmirror) os.unlink(ud.fullmirror)
os.chdir(ud.clonedir)
logger.info("Creating tarball of git repository") logger.info("Creating tarball of git repository")
runfetchcmd("tar -czf %s %s" % (ud.fullmirror, os.path.join(".") ), d) runfetchcmd("tar -czf %s %s" % (ud.fullmirror, os.path.join(".") ), d, workdir=ud.clonedir)
runfetchcmd("touch %s.done" % (ud.fullmirror), d) runfetchcmd("touch %s.done" % (ud.fullmirror), d, workdir=ud.clonedir)
def unpack(self, ud, destdir, d): def unpack(self, ud, destdir, d):
""" unpack the downloaded src to destdir""" """ unpack the downloaded src to destdir"""
@ -321,21 +316,21 @@ class Git(FetchMethod):
cloneflags += " --mirror" cloneflags += " --mirror"
runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, ud.clonedir, destdir), d) runfetchcmd("%s clone %s %s/ %s" % (ud.basecmd, cloneflags, ud.clonedir, destdir), d)
os.chdir(destdir)
repourl = self._get_repo_url(ud) repourl = self._get_repo_url(ud)
runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d) runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, repourl), d, workdir=destdir)
if not ud.nocheckout: if not ud.nocheckout:
if subdir != "": if subdir != "":
runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.revisions[ud.names[0]], readpathspec), d) runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.revisions[ud.names[0]], readpathspec), d,
runfetchcmd("%s checkout-index -q -f -a" % ud.basecmd, d) workdir=destdir)
runfetchcmd("%s checkout-index -q -f -a" % ud.basecmd, d, workdir=destdir)
elif not ud.nobranch: elif not ud.nobranch:
branchname = ud.branches[ud.names[0]] branchname = ud.branches[ud.names[0]]
runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \
ud.revisions[ud.names[0]]), d) ud.revisions[ud.names[0]]), d, workdir=destdir)
runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \
branchname), d) branchname), d, workdir=destdir)
else: else:
runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d) runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir)
return True return True
@ -349,7 +344,7 @@ class Git(FetchMethod):
def supports_srcrev(self): def supports_srcrev(self):
return True return True
def _contains_ref(self, ud, d, name): def _contains_ref(self, ud, d, name, wd):
cmd = "" cmd = ""
if ud.nobranch: if ud.nobranch:
cmd = "%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % ( cmd = "%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (
@ -358,7 +353,7 @@ class Git(FetchMethod):
cmd = "%s branch --contains %s --list %s 2> /dev/null | wc -l" % ( cmd = "%s branch --contains %s --list %s 2> /dev/null | wc -l" % (
ud.basecmd, ud.revisions[name], ud.branches[name]) ud.basecmd, ud.revisions[name], ud.branches[name])
try: try:
output = runfetchcmd(cmd, d, quiet=True) output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
except bb.fetch2.FetchError: except bb.fetch2.FetchError:
return False return False
if len(output.split()) > 1: if len(output.split()) > 1:

25
bitbake/lib/bb/fetch2/gitannex.py
View File

@ -34,43 +34,42 @@ class GitANNEX(Git):
""" """
return ud.type in ['gitannex'] return ud.type in ['gitannex']
def uses_annex(self, ud, d): def uses_annex(self, ud, d, wd):
for name in ud.names: for name in ud.names:
try: try:
runfetchcmd("%s rev-list git-annex" % (ud.basecmd), d, quiet=True) runfetchcmd("%s rev-list git-annex" % (ud.basecmd), d, quiet=True, workdir=wd)
return True return True
except bb.fetch.FetchError: except bb.fetch.FetchError:
pass pass
return False return False
def update_annex(self, ud, d): def update_annex(self, ud, d, wd):
try: try:
runfetchcmd("%s annex get --all" % (ud.basecmd), d, quiet=True) runfetchcmd("%s annex get --all" % (ud.basecmd), d, quiet=True, workdir=wd)
except bb.fetch.FetchError: except bb.fetch.FetchError:
return False return False
runfetchcmd("chmod u+w -R %s/annex" % (ud.clonedir), d, quiet=True) runfetchcmd("chmod u+w -R %s/annex" % (ud.clonedir), d, quiet=True, workdir=wd)
return True return True
def download(self, ud, d): def download(self, ud, d):
Git.download(self, ud, d) Git.download(self, ud, d)
os.chdir(ud.clonedir) annex = self.uses_annex(ud, d, ud.clonedir)
annex = self.uses_annex(ud, d)
if annex: if annex:
self.update_annex(ud, d) self.update_annex(ud, d, ud.clonedir)
def unpack(self, ud, destdir, d): def unpack(self, ud, destdir, d):
Git.unpack(self, ud, destdir, d) Git.unpack(self, ud, destdir, d)
os.chdir(ud.destdir)
try: try:
runfetchcmd("%s annex init" % (ud.basecmd), d) runfetchcmd("%s annex init" % (ud.basecmd), d, workdir=ud.destdir)
except bb.fetch.FetchError: except bb.fetch.FetchError:
pass pass
annex = self.uses_annex(ud, d) annex = self.uses_annex(ud, d, ud.destdir)
if annex: if annex:
runfetchcmd("%s annex get" % (ud.basecmd), d) runfetchcmd("%s annex get" % (ud.basecmd), d, workdir=ud.destdir)
runfetchcmd("chmod u+w -R %s/.git/annex" % (ud.destdir), d, quiet=True) runfetchcmd("chmod u+w -R %s/.git/annex" % (ud.destdir), d, quiet=True, workdir=ud.destdir)

23
bitbake/lib/bb/fetch2/gitsm.py
View File

@ -43,10 +43,10 @@ class GitSM(Git):
""" """
return ud.type in ['gitsm'] return ud.type in ['gitsm']
def uses_submodules(self, ud, d): def uses_submodules(self, ud, d, wd):
for name in ud.names: for name in ud.names:
try: try:
runfetchcmd("%s show %s:.gitmodules" % (ud.basecmd, ud.revisions[name]), d, quiet=True) runfetchcmd("%s show %s:.gitmodules" % (ud.basecmd, ud.revisions[name]), d, quiet=True, workdir=wd)
return True return True
except bb.fetch.FetchError: except bb.fetch.FetchError:
pass pass
@ -107,28 +107,25 @@ class GitSM(Git):
os.mkdir(tmpclonedir) os.mkdir(tmpclonedir)
os.rename(ud.clonedir, gitdir) os.rename(ud.clonedir, gitdir)
runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d) runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*true/bare = false/'", d)
os.chdir(tmpclonedir) runfetchcmd(ud.basecmd + " reset --hard", d, workdir=tmpclonedir)
runfetchcmd(ud.basecmd + " reset --hard", d) runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d, workdir=tmpclonedir)
runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d) runfetchcmd(ud.basecmd + " submodule update --init --recursive", d, workdir=tmpclonedir)
runfetchcmd(ud.basecmd + " submodule update --init --recursive", d)
self._set_relative_paths(tmpclonedir) self._set_relative_paths(tmpclonedir)
runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d) runfetchcmd("sed " + gitdir + "/config -i -e 's/bare.*=.*false/bare = true/'", d, workdir=tmpclonedir)
os.rename(gitdir, ud.clonedir,) os.rename(gitdir, ud.clonedir,)
bb.utils.remove(tmpclonedir, True) bb.utils.remove(tmpclonedir, True)
def download(self, ud, d): def download(self, ud, d):
Git.download(self, ud, d) Git.download(self, ud, d)
os.chdir(ud.clonedir) submodules = self.uses_submodules(ud, d, ud.clonedir)
submodules = self.uses_submodules(ud, d)
if submodules: if submodules:
self.update_submodules(ud, d) self.update_submodules(ud, d)
def unpack(self, ud, destdir, d): def unpack(self, ud, destdir, d):
Git.unpack(self, ud, destdir, d) Git.unpack(self, ud, destdir, d)
os.chdir(ud.destdir) submodules = self.uses_submodules(ud, d, ud.destdir)
submodules = self.uses_submodules(ud, d)
if submodules: if submodules:
runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d) runfetchcmd(ud.basecmd + " checkout " + ud.revisions[ud.names[0]], d, workdir=ud.destdir)
runfetchcmd(ud.basecmd + " submodule update --init --recursive", d) runfetchcmd(ud.basecmd + " submodule update --init --recursive", d, workdir=ud.destdir)

28
bitbake/lib/bb/fetch2/hg.py
View File

@ -169,25 +169,22 @@ class Hg(FetchMethod):
# If the checkout doesn't exist and the mirror tarball does, extract it # If the checkout doesn't exist and the mirror tarball does, extract it
if not os.path.exists(ud.pkgdir) and os.path.exists(ud.fullmirror): if not os.path.exists(ud.pkgdir) and os.path.exists(ud.fullmirror):
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir) runfetchcmd("tar -xzf %s" % (ud.fullmirror), d, workdir=ud.pkgdir)
runfetchcmd("tar -xzf %s" % (ud.fullmirror), d)
if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK): if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK):
# Found the source, check whether need pull # Found the source, check whether need pull
updatecmd = self._buildhgcommand(ud, d, "update") updatecmd = self._buildhgcommand(ud, d, "update")
os.chdir(ud.moddir)
logger.debug(1, "Running %s", updatecmd) logger.debug(1, "Running %s", updatecmd)
try: try:
runfetchcmd(updatecmd, d) runfetchcmd(updatecmd, d, workdir=ud.moddir)
except bb.fetch2.FetchError: except bb.fetch2.FetchError:
# Runnning pull in the repo # Runnning pull in the repo
pullcmd = self._buildhgcommand(ud, d, "pull") pullcmd = self._buildhgcommand(ud, d, "pull")
logger.info("Pulling " + ud.url) logger.info("Pulling " + ud.url)
# update sources there # update sources there
os.chdir(ud.moddir)
logger.debug(1, "Running %s", pullcmd) logger.debug(1, "Running %s", pullcmd)
bb.fetch2.check_network_access(d, pullcmd, ud.url) bb.fetch2.check_network_access(d, pullcmd, ud.url)
runfetchcmd(pullcmd, d) runfetchcmd(pullcmd, d, workdir=ud.moddir)
try: try:
os.unlink(ud.fullmirror) os.unlink(ud.fullmirror)
except OSError as exc: except OSError as exc:
@ -200,17 +197,15 @@ class Hg(FetchMethod):
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir)
logger.debug(1, "Running %s", fetchcmd) logger.debug(1, "Running %s", fetchcmd)
bb.fetch2.check_network_access(d, fetchcmd, ud.url) bb.fetch2.check_network_access(d, fetchcmd, ud.url)
runfetchcmd(fetchcmd, d) runfetchcmd(fetchcmd, d, workdir=ud.pkgdir)
# Even when we clone (fetch), we still need to update as hg's clone # Even when we clone (fetch), we still need to update as hg's clone
# won't checkout the specified revision if its on a branch # won't checkout the specified revision if its on a branch
updatecmd = self._buildhgcommand(ud, d, "update") updatecmd = self._buildhgcommand(ud, d, "update")
os.chdir(ud.moddir)
logger.debug(1, "Running %s", updatecmd) logger.debug(1, "Running %s", updatecmd)
runfetchcmd(updatecmd, d) runfetchcmd(updatecmd, d, workdir=ud.moddir)
def clean(self, ud, d): def clean(self, ud, d):
""" Clean the hg dir """ """ Clean the hg dir """
@ -246,10 +241,9 @@ class Hg(FetchMethod):
if os.path.islink(ud.fullmirror): if os.path.islink(ud.fullmirror):
os.unlink(ud.fullmirror) os.unlink(ud.fullmirror)
os.chdir(ud.pkgdir)
logger.info("Creating tarball of hg repository") logger.info("Creating tarball of hg repository")
runfetchcmd("tar -czf %s %s" % (ud.fullmirror, ud.module), d) runfetchcmd("tar -czf %s %s" % (ud.fullmirror, ud.module), d, workdir=ud.pkgdir)
runfetchcmd("touch %s.done" % (ud.fullmirror), d) runfetchcmd("touch %s.done" % (ud.fullmirror), d, workdir=ud.pkgdir)
def localpath(self, ud, d): def localpath(self, ud, d):
return ud.pkgdir return ud.pkgdir
@ -269,10 +263,8 @@ class Hg(FetchMethod):
logger.debug(2, "Unpack: creating new hg repository in '" + codir + "'") logger.debug(2, "Unpack: creating new hg repository in '" + codir + "'")
runfetchcmd("%s init %s" % (ud.basecmd, codir), d) runfetchcmd("%s init %s" % (ud.basecmd, codir), d)
logger.debug(2, "Unpack: updating source in '" + codir + "'") logger.debug(2, "Unpack: updating source in '" + codir + "'")
os.chdir(codir) runfetchcmd("%s pull %s" % (ud.basecmd, ud.moddir), d, workdir=codir)
runfetchcmd("%s pull %s" % (ud.basecmd, ud.moddir), d) runfetchcmd("%s up -C %s" % (ud.basecmd, revflag), d, workdir=codir)
runfetchcmd("%s up -C %s" % (ud.basecmd, revflag), d)
else: else:
logger.debug(2, "Unpack: extracting source to '" + codir + "'") logger.debug(2, "Unpack: extracting source to '" + codir + "'")
os.chdir(ud.moddir) runfetchcmd("%s archive -t files %s %s" % (ud.basecmd, revflag, codir), d, workdir=ud.moddir)
runfetchcmd("%s archive -t files %s %s" % (ud.basecmd, revflag, codir), d)

22
bitbake/lib/bb/fetch2/npm.py
View File

@ -113,16 +113,13 @@ class Npm(FetchMethod):
bb.fatal("NPM package %s downloaded not a tarball!" % file) bb.fatal("NPM package %s downloaded not a tarball!" % file)
# Change to subdir before executing command # Change to subdir before executing command
save_cwd = os.getcwd()
if not os.path.exists(destdir): if not os.path.exists(destdir):
os.makedirs(destdir) os.makedirs(destdir)
os.chdir(destdir)
path = d.getVar('PATH', True) path = d.getVar('PATH', True)
if path: if path:
cmd = "PATH=\"%s\" %s" % (path, cmd) cmd = "PATH=\"%s\" %s" % (path, cmd)
bb.note("Unpacking %s to %s/" % (file, os.getcwd())) bb.note("Unpacking %s to %s/" % (file, destdir))
ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True) ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True, cwd=destdir)
os.chdir(save_cwd)
if ret != 0: if ret != 0:
raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud.url) raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud.url)
@ -239,10 +236,7 @@ class Npm(FetchMethod):
if not os.listdir(ud.pkgdatadir) and os.path.exists(ud.fullmirror): if not os.listdir(ud.pkgdatadir) and os.path.exists(ud.fullmirror):
dest = d.getVar("DL_DIR", True) dest = d.getVar("DL_DIR", True)
bb.utils.mkdirhier(dest) bb.utils.mkdirhier(dest)
save_cwd = os.getcwd() runfetchcmd("tar -xJf %s" % (ud.fullmirror), d, workdir=dest)
os.chdir(dest)
runfetchcmd("tar -xJf %s" % (ud.fullmirror), d)
os.chdir(save_cwd)
return return
shwrf = d.getVar('NPM_SHRINKWRAP', True) shwrf = d.getVar('NPM_SHRINKWRAP', True)
@ -275,10 +269,8 @@ class Npm(FetchMethod):
if os.path.islink(ud.fullmirror): if os.path.islink(ud.fullmirror):
os.unlink(ud.fullmirror) os.unlink(ud.fullmirror)
save_cwd = os.getcwd() dldir = d.getVar("DL_DIR", True)
os.chdir(d.getVar("DL_DIR", True))
logger.info("Creating tarball of npm data") logger.info("Creating tarball of npm data")
runfetchcmd("tar -cJf %s npm/%s npm/%s" % (ud.fullmirror, ud.bbnpmmanifest, ud.pkgname), d) runfetchcmd("tar -cJf %s npm/%s npm/%s" % (ud.fullmirror, ud.bbnpmmanifest, ud.pkgname), d,
runfetchcmd("touch %s.done" % (ud.fullmirror), d) workdir=dldir)
os.chdir(save_cwd) runfetchcmd("touch %s.done" % (ud.fullmirror), d, workdir=dldir)

10
bitbake/lib/bb/fetch2/osc.py
View File

@ -88,23 +88,21 @@ class Osc(FetchMethod):
oscupdatecmd = self._buildosccommand(ud, d, "update") oscupdatecmd = self._buildosccommand(ud, d, "update")
logger.info("Update "+ ud.url) logger.info("Update "+ ud.url)
# update sources there # update sources there
os.chdir(ud.moddir)
logger.debug(1, "Running %s", oscupdatecmd) logger.debug(1, "Running %s", oscupdatecmd)
bb.fetch2.check_network_access(d, oscupdatecmd, ud.url) bb.fetch2.check_network_access(d, oscupdatecmd, ud.url)
runfetchcmd(oscupdatecmd, d) runfetchcmd(oscupdatecmd, d, workdir=ud.moddir)
else: else:
oscfetchcmd = self._buildosccommand(ud, d, "fetch") oscfetchcmd = self._buildosccommand(ud, d, "fetch")
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir)
logger.debug(1, "Running %s", oscfetchcmd) logger.debug(1, "Running %s", oscfetchcmd)
bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) bb.fetch2.check_network_access(d, oscfetchcmd, ud.url)
runfetchcmd(oscfetchcmd, d) runfetchcmd(oscfetchcmd, d, workdir=ud.pkgdir)
os.chdir(os.path.join(ud.pkgdir + ud.path))
# tar them up to a defined filename # tar them up to a defined filename
runfetchcmd("tar -czf %s %s" % (ud.localpath, ud.module), d, cleanup = [ud.localpath]) runfetchcmd("tar -czf %s %s" % (ud.localpath, ud.module), d,
cleanup=[ud.localpath], workdir=os.path.join(ud.pkgdir + ud.path))
def supports_srcrev(self): def supports_srcrev(self):
return False return False

6
bitbake/lib/bb/fetch2/perforce.py
View File

@ -168,15 +168,13 @@ class Perforce(FetchMethod):
bb.utils.remove(ud.pkgdir, True) bb.utils.remove(ud.pkgdir, True)
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir)
for afile in filelist: for afile in filelist:
p4fetchcmd = self._buildp4command(ud, d, 'print', afile) p4fetchcmd = self._buildp4command(ud, d, 'print', afile)
bb.fetch2.check_network_access(d, p4fetchcmd) bb.fetch2.check_network_access(d, p4fetchcmd)
runfetchcmd(p4fetchcmd, d) runfetchcmd(p4fetchcmd, d, workdir=ud.pkgdir)
os.chdir(ud.pkgdir) runfetchcmd('tar -czf %s p4' % (ud.localpath), d, cleanup=[ud.localpath], workdir=ud.pkgdir)
runfetchcmd('tar -czf %s p4' % (ud.localpath), d, cleanup = [ud.localpath])
def clean(self, ud, d): def clean(self, ud, d):
""" Cleanup p4 specific files and dirs""" """ Cleanup p4 specific files and dirs"""

13
bitbake/lib/bb/fetch2/repo.py
View File

@ -69,15 +69,14 @@ class Repo(FetchMethod):
else: else:
username = "" username = ""
bb.utils.mkdirhier(os.path.join(codir, "repo")) repodir = os.path.join(codir, "repo")
os.chdir(os.path.join(codir, "repo")) bb.utils.mkdirhier(repodir)
if not os.path.exists(os.path.join(codir, "repo", ".repo")): 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) 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) 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, "repo sync %s" % ud.url, ud.url) bb.fetch2.check_network_access(d, "repo sync %s" % ud.url, ud.url)
runfetchcmd("repo sync", d) runfetchcmd("repo sync", d, workdir=repodir)
os.chdir(codir)
scmdata = ud.parm.get("scmdata", "") scmdata = ud.parm.get("scmdata", "")
if scmdata == "keep": if scmdata == "keep":
@ -86,7 +85,7 @@ class Repo(FetchMethod):
tar_flags = "--exclude='.repo' --exclude='.git'" tar_flags = "--exclude='.repo' --exclude='.git'"
# Create a cache # Create a cache
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d) runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d, workdir=codir)
def supports_srcrev(self): def supports_srcrev(self):
return False return False

13
bitbake/lib/bb/fetch2/svn.py
View File

@ -126,25 +126,22 @@ class Svn(FetchMethod):
if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK): if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK):
svnupdatecmd = self._buildsvncommand(ud, d, "update") svnupdatecmd = self._buildsvncommand(ud, d, "update")
logger.info("Update " + ud.url) logger.info("Update " + ud.url)
# update sources there
os.chdir(ud.moddir)
# We need to attempt to run svn upgrade first in case its an older working format # We need to attempt to run svn upgrade first in case its an older working format
try: try:
runfetchcmd(ud.basecmd + " upgrade", d) runfetchcmd(ud.basecmd + " upgrade", d, workdir=ud.moddir)
except FetchError: except FetchError:
pass pass
logger.debug(1, "Running %s", svnupdatecmd) logger.debug(1, "Running %s", svnupdatecmd)
bb.fetch2.check_network_access(d, svnupdatecmd, ud.url) bb.fetch2.check_network_access(d, svnupdatecmd, ud.url)
runfetchcmd(svnupdatecmd, d) runfetchcmd(svnupdatecmd, d, workdir=ud.moddir)
else: else:
svnfetchcmd = self._buildsvncommand(ud, d, "fetch") svnfetchcmd = self._buildsvncommand(ud, d, "fetch")
logger.info("Fetch " + ud.url) logger.info("Fetch " + ud.url)
# check out sources there # check out sources there
bb.utils.mkdirhier(ud.pkgdir) bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir)
logger.debug(1, "Running %s", svnfetchcmd) logger.debug(1, "Running %s", svnfetchcmd)
bb.fetch2.check_network_access(d, svnfetchcmd, ud.url) bb.fetch2.check_network_access(d, svnfetchcmd, ud.url)
runfetchcmd(svnfetchcmd, d) runfetchcmd(svnfetchcmd, d, ud.pkgdir)
scmdata = ud.parm.get("scmdata", "") scmdata = ud.parm.get("scmdata", "")
if scmdata == "keep": if scmdata == "keep":
@ -152,9 +149,9 @@ class Svn(FetchMethod):
else: else:
tar_flags = "--exclude='.svn'" tar_flags = "--exclude='.svn'"
os.chdir(ud.pkgdir)
# tar them up to a defined filename # tar them up to a defined filename
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.path_spec), d, cleanup = [ud.localpath]) runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, ud.path_spec), d,
cleanup=[ud.localpath], workdir=ud.pkgdir)
def clean(self, ud, d): def clean(self, ud, d):
""" Clean SVN specific files and dirs """ """ Clean SVN specific files and dirs """