[oe-commits] Enrico Scholz : gitpkgv.bbclass: cache GITPKGV result
git at git.openembedded.org
git at git.openembedded.org
Fri Jan 18 09:52:38 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: 1b5e1c9551406d3e5d98e0468ee140c26851ab09
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1b5e1c9551406d3e5d98e0468ee140c26851ab09
Author: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Date: Fri Nov 16 18:11:31 2012 +0000
gitpkgv.bbclass: cache GITPKGV result
gitpkgv runs the 'git rev-list | wc -l' several times when processing a
package using GITPKGV. This takes ages for packages like the linux
kernel which has a) a large repository and b) lots of subpackages.
This patch caches the result of 'git rev-list' and uses it on the next
run.
Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/classes/gitpkgv.bbclass | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass
index 165ba1e..7bdc538 100644
--- a/meta-oe/classes/gitpkgv.bbclass
+++ b/meta-oe/classes/gitpkgv.bbclass
@@ -50,6 +50,7 @@ def gitpkgv_drop_tag_prefix(version):
def get_git_pkgv(d, use_tags):
import os
import bb
+ from pipes import quote
src_uri = d.getVar('SRC_URI', 1).split()
fetcher = bb.fetch2.Fetch(src_uri, d)
@@ -71,22 +72,39 @@ def get_git_pkgv(d, use_tags):
found = True
- cwd = os.getcwd()
- os.chdir(url.localpath)
+ vars = { 'repodir' : quote(url.localpath),
+ 'rev' : quote(rev) }
- commits = bb.fetch2.runfetchcmd("git rev-list %s -- 2> /dev/null | wc -l" % rev, d, quiet=True).strip()
+ rev = bb.fetch2.get_srcrev(d).split('+')[1]
+ rev_file = os.path.join(url.localpath, "oe-gitpkgv_" + rev)
+
+ if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0:
+ commits = bb.fetch2.runfetchcmd(
+ "cd %(repodir)s && "
+ "git rev-list %(rev)s -- 2> /dev/null "
+ "| wc -l" % vars,
+ d, quiet=True).strip().lstrip('0')
+
+ if commits != "":
+ oe.path.remove(rev_file, recurse=False)
+ open(rev_file, "w").write("%d\n" % int(commits))
+ else:
+ commits = "0"
+ else:
+ commits = open(rev_file, "r").readline(128).strip()
if use_tags:
try:
- output = bb.fetch2.runfetchcmd("git describe %s 2>/dev/null" % rev, d, quiet=True).strip()
+ output = bb.fetch2.runfetchcmd(
+ "cd %(repodir)s && "
+ "git describe %(rev)s 2>/dev/null" % vars,
+ d, quiet=True).strip()
ver = gitpkgv_drop_tag_prefix(output)
except Exception:
ver = "0.0-%s-g%s" % (commits, rev[:7])
else:
ver = "%s+%s" % (commits, rev[:7])
- os.chdir(cwd)
-
format = format.replace(name, ver)
if found:
More information about the Openembedded-commits
mailing list