summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-05-15 22:33:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 15:19:36 +0100
commitdf2a37abd00fc30837b60aaa0bef43c7838afeb4 (patch)
treea2516286d0e3d7400f6c599bc3d1e74e39657628 /bitbake
parent8bb06fd765d65b106717626e8dd1349860c49cc2 (diff)
downloadpoky-df2a37abd00fc30837b60aaa0bef43c7838afeb4.tar.gz
poky-df2a37abd00fc30837b60aaa0bef43c7838afeb4.tar.bz2
poky-df2a37abd00fc30837b60aaa0bef43c7838afeb4.zip
git fetcher: add support for rebaseable git repo
Some upstream git repo may rebase in the future, which means current revision may disappear from the upstream repo after the rebase. current git fetcher can not handle this case, because the git mirror tar ball is per repo, and may also change in the rebase and lost the current revision info. To fix this issue, this patch - add rebaseable tag in the SRC_URI - for rebaseable repo, make git mirror tar ball per revision, in this case, even upstream rebase, the git mirror still has the current revision info. - for rebaseable repo, generate mirror tar ball by default, since the repo may change in the future. (Bitbake rev: 92701d4c5372db48847c70da4ebd0736d79fd54b) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/git.py28
1 files changed, 20 insertions, 8 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 811acbf6c6..82721c6cfa 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -57,6 +57,11 @@ class Git(FetchMethod):
if 'nocheckout' in ud.parm:
ud.nocheckout = True
+ # rebaseable means the upstream git repo may rebase in the future,
+ # and current revision may disappear from upstream repo
+ # rebaseable is false by default. set rebaseable=1 in SRC_URI if rebaseable.
+ ud.rebaseable = ud.parm.get("rebaseable","0") == "1"
+
branches = ud.parm.get("branch", "master").split(',')
if len(branches) != len(ud.names):
raise bb.fetch2.ParameterError("The number of name and branch parameters is not balanced", ud.url)
@@ -65,16 +70,9 @@ class Git(FetchMethod):
branch = branches[ud.names.index(name)]
ud.branches[name] = branch
- gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
- ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname)
- ud.fullmirror = os.path.join(data.getVar("DL_DIR", d, True), ud.mirrortarball)
- ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
-
ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
- ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0"
-
- ud.localfile = ud.clonedir
+ ud.write_tarballs = ((data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0") or ud.rebaseable
ud.setup_revisons(d)
@@ -84,6 +82,20 @@ class Git(FetchMethod):
ud.branches[name] = ud.revisions[name]
ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
+ gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
+ # for rebaseable git repo, it is necessary to keep mirror tar ball
+ # per revision, so that even the revision disappears from the
+ # upstream repo in the future, the mirror will remain intact and still
+ # contains the revision
+ if ud.rebaseable:
+ for name in ud.names:
+ gitsrcname = gitsrcname + '_' + ud.revisions[name]
+ ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname)
+ ud.fullmirror = os.path.join(data.getVar("DL_DIR", d, True), ud.mirrortarball)
+ ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
+
+ ud.localfile = ud.clonedir
+
def localpath(self, url, ud, d):
return ud.clonedir