On Tue, Nov 17, 2009 at 11:18:02AM +0100, [email protected] wrote: > On Tue, 17 Nov 2009, Martin Jansa wrote: > > > BTW: SRCPV seems to be expanded in PV a bit sooner than SRCREV was, > > which with combination with BB_GIT_CLONE_FOR_SRCREV means that all git > > repositories are checked during recipe parsing (Klaus Kurzmann has a > > list of git repositories used in OE recipes which are not accessible)
Hopefully resolved with this bitbake patch -- uin:136542059 jid:[email protected] Jansa Martin sip:[email protected] JaMa
>From 6956d60446de01af655eb992cbe31d02c8bb2a21 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Tue, 17 Nov 2009 15:44:43 +0100 Subject: [PATCH 2/2] BB_GIT_CLONE_FOR_SRCREV using only _sortable_buildnumber() for known revision --- lib/bb/fetch/__init__.py | 15 +++++++-------- lib/bb/fetch/git.py | 32 ++++++-------------------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index 9508908..db3eb40 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -553,14 +553,8 @@ class Fetch(object): """ """ - has_want_sortable = hasattr(self, "_want_sortable_revision") - has_sortable = hasattr(self, "_sortable_revision") - - if not has_want_sortable and has_sortable: - return self._sortable_revision(url, ud, d) - elif has_want_sortable and self._want_sortable_revision(url, ud, d) and has_sortable: - return self._sortable_revision(url, ud, d) - + has_want_sortable = hasattr(self, "_want_sortable_buildnumber") + has_sortable = hasattr(self, "_sortable_buildnumber") pd = persist_data.PersistData(d) key = self.generate_revision_key(url, ud, d) @@ -577,6 +571,11 @@ class Fetch(object): if last_rev == latest_rev: return str(count + "+" + latest_rev) + if not has_want_sortable and has_sortable: + count = self._sortable_buildnumber(url, ud, d, latest_rev) + elif has_want_sortable and self._want_sortable_buildnumber(url, ud, d) and has_sortable: + count = self._sortable_buildnumber(url, ud, d, latest_rev) + if count is None: count = "0" elif uselocalcount: diff --git a/lib/bb/fetch/git.py b/lib/bb/fetch/git.py index 5cdf656..b5c4c0b 100644 --- a/lib/bb/fetch/git.py +++ b/lib/bb/fetch/git.py @@ -146,44 +146,24 @@ class Git(Fetch): def _build_revision(self, url, ud, d): return ud.tag - def _want_sortable_revision(self, url, ud, d): + def _want_sortable_buildnumber(self, url, ud, d): return bb.data.getVar("BB_GIT_CLONE_FOR_SRCREV", d, True) or False - def _sortable_revision(self, url, ud, d): + def _sortable_buildnumber(self, url, ud, d, rev): """ This is only called when _want_sortable_revision called true - We will have to get the updated revision. + Latest revision is already known, we need only to count revisions in git repo. """ gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.')) repodir = os.path.join(data.expand('${GITDIR}', d), gitsrcname) - key = "GIT_CACHED_REVISION-%s-%s" % (gitsrcname, ud.tag) - if bb.data.getVar(key, d): - return bb.data.getVar(key, d) - - - # Runtime warning on wrongly configured sources - if ud.tag == "1": - bb.msg.error(1, bb.msg.domain.Fetcher, "SRCREV is '1'. This indicates a configuration error of %s" % url) - return "0+1" - cwd = os.getcwd() - # Check if we have the rev already - if not os.path.exists(repodir): - print "no repo" - self.go(None, ud, d) - os.chdir(repodir) - if not self._contains_ref(ud.tag, d): - self.go(None, ud, d) - output = runfetchcmd("git rev-list %s -- 2> /dev/null | wc -l" % ud.tag, d, quiet=True) + output = runfetchcmd("git rev-list %s -- 2> /dev/null | wc -l" % rev, d, quiet=True) os.chdir(cwd) - sortable_revision = "%s+%s" % (output.split()[0], ud.tag) - bb.data.setVar(key, sortable_revision, d) - return sortable_revision - - + sortable_buildnumber= "%s" % (output.split()[0]) + return sortable_buildnumber -- 1.6.5.2
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
