From 81e1ae4657bde1cd843a219f99be4024b8b96f16 Mon Sep 17 00:00:00 2001 From: "niko.mauno@vaisala.com" Date: Sat, 23 Nov 2019 15:43:21 +0200 Subject: gitpkgv.bbclass: Use --git-dir option Avoid redundant shell working directory change by resorting to '--git-dir' option for git command instead. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/classes/gitpkgv.bbclass | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 2d9680a35c..22609f584f 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -87,10 +87,8 @@ def get_git_pkgv(d, use_tags): 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') + "git --git-dir=%(repodir)s 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) @@ -105,9 +103,8 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( - "cd %(repodir)s && " - "git describe %(rev)s 2>/dev/null" % vars, - d, quiet=True).strip() + "git --git-dir=%(repodir)s 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, vars['rev'][:7]) -- cgit 1.2.3-korg