diff options
| author |   niko.mauno@vaisala.com <niko.mauno@vaisala.com> | 2019-11-23 15:46:30 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster@mvista.com> | 2020-01-11 14:15:18 -0800 |
| commit | e35db360d53ef341c8eedd716d2b862c44e2092b (patch) | |
| tree | 2f76d86ec449a7ac36b6def80de47294c215a5b9 | |
| parent | a24acf94d48d635eca668ea34598c6e5c857e3f8 (diff) | |
| download | meta-openembedded-contrib-e35db360d53ef341c8eedd716d2b862c44e2092b.tar.gz | |
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 <niko.mauno@vaisala.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
| -rw-r--r-- | meta-oe/classes/gitpkgv.bbclass | 11 |
1 files 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]) |