mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake/fetch2/git: Switch to completely use bare clones

Browse Source 
We no longer need index/workdir support in the mirror tree and it causes all
kind of reference naming problems.Simplifying the code to remove this and use
just bare clones addresses this problem.

We increase the "version" number on the mirror tarballs to reflect the change
and ensure older mirror tarballs are not used as they would break.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-02-06 10:20:18 +00:00
parent 66e6a9798e
commit e4c1e99f23
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ class Git(Fetch):
ud.branches[name] = branch ud.branches[name] = branch
gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.')) gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
ud.mirrortarball = 'git_%s.tar.gz' % (gitsrcname) ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname)
ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname) ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
@@ -116,8 +116,8 @@ class Git(Fetch):
# If the repo still doesn't exist, fallback to cloning it # If the repo still doesn't exist, fallback to cloning it
if not os.path.exists(ud.clonedir): if not os.path.exists(ud.clonedir):
bb.fetch2.check_network_access(d, "git clone %s%s" % (ud.host, ud.path)) bb.fetch2.check_network_access(d, "git clone --bare %s%s" % (ud.host, ud.path))
runfetchcmd("%s clone -n %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.clonedir), d) runfetchcmd("%s clone --bare %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.clonedir), d)
os.chdir(ud.clonedir) os.chdir(ud.clonedir)
# Update the checkout if needed # Update the checkout if needed
@@ -147,7 +147,7 @@ class Git(Fetch):
mirror_tarballs = data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) mirror_tarballs = data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True)
if mirror_tarballs != "0" and ud.repochanged: if mirror_tarballs != "0" and ud.repochanged:
logger.info("Creating tarball of git repository") logger.info("Creating tarball of git repository")
runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".", ".git", "*") ), d) runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".") ), d)
def unpack(self, ud, destdir, d): def unpack(self, ud, destdir, d):
""" unpack the downloaded src to destdir""" """ unpack the downloaded src to destdir"""
@@ -163,11 +163,6 @@ class Git(Fetch):
bb.utils.prunedir(destdir) bb.utils.prunedir(destdir)
runfetchcmd("git clone -s -n %s %s" % (ud.clonedir, destdir), d) runfetchcmd("git clone -s -n %s %s" % (ud.clonedir, destdir), d)
if os.path.exists("%s/.git/refs/remotes/origin" % ud.clonedir):
bb.mkdirhier("%s/.git/refs/remotes/origin/" % destdir)
runfetchcmd("cp -af %s/.git/refs/remotes/origin/* %s/.git/refs/remotes/origin/" %(ud.clonedir, destdir), d)
if os.path.exists("%s/.git/packed-refs" % ud.clonedir):
runfetchcmd("cp -af %s/.git/packed-refs %s/.git/" %(ud.clonedir, destdir), d)
if not ud.nocheckout: if not ud.nocheckout:
os.chdir(destdir) os.chdir(destdir)
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)