aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniko.mauno@vaisala.com <niko.mauno@vaisala.com>2019-11-23 15:43:22 +0200
committerArmin Kuster <akuster808@gmail.com>2019-11-24 11:52:29 -0800
commite5cba1a54cb953cbfa570fb2c2f2fecaabe2c8c5 (patch)
treec522ea1927268abfbf8b6cf27143d6ff29903bfc
parent81e1ae4657bde1cd843a219f99be4024b8b96f16 (diff)
downloadmeta-openembedded-contrib-e5cba1a54cb953cbfa570fb2c2f2fecaabe2c8c5.tar.gz
meta-openembedded-contrib-e5cba1a54cb953cbfa570fb2c2f2fecaabe2c8c5.tar.bz2
meta-openembedded-contrib-e5cba1a54cb953cbfa570fb2c2f2fecaabe2c8c5.zip
gitpkgv.bbclass: Support also lightweight tags
When checking for commit specific tags during GITPKGVTAG resolution, use additional '--tags' and '--exact-match' options for 'git describe' command. This changes the behaviour so that in case an annotated tag does not exist for the particular commit, then the latest lightweight (non-annotated) tag is used instead, in case that commit has at least one such tag. Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/classes/gitpkgv.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass
index 22609f584f..ab591bd45c 100644
--- a/meta-oe/classes/gitpkgv.bbclass
+++ b/meta-oe/classes/gitpkgv.bbclass
@@ -7,8 +7,8 @@
# NN equals the total number of revs up to SRCREV
# GITHASH is SRCREV's (full) hash
#
-# - GITPKGVTAG which is the output of 'git describe' allowing for
-# automatic versioning
+# - GITPKGVTAG which is the output of 'git describe --tags --exact-match'
+# allowing for automatic versioning
#
# gitpkgv.bbclass assumes the git repository has been cloned, and
# contains SRCREV. So ${GITPKGV} and ${GITPKGVTAG} should never be
@@ -103,7 +103,7 @@ def get_git_pkgv(d, use_tags):
if use_tags:
try:
output = bb.fetch2.runfetchcmd(
- "git --git-dir=%(repodir)s describe %(rev)s 2>/dev/null"
+ "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null"
% vars, d, quiet=True).strip()
ver = gitpkgv_drop_tag_prefix(output)
except Exception: