From: Chris Larson Date: Thu, 14 Oct 2010 00:29:09 +0000 (-0700) Subject: gitver: drop 'v' tag prefix where appropriate X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0ffe76630abda6d528dd9ac961051ba09718ed;p=openembedded.git gitver: drop 'v' tag prefix where appropriate If the tag starts with 'v' followed by a number, drop the 'v' prefix. This will not be done for you if you customize GIT_TAGADJUST. Signed-off-by: Chris Larson --- diff --git a/classes/gitver.bbclass b/classes/gitver.bbclass index 3edb273eaf..2efb3f1f5b 100644 --- a/classes/gitver.bbclass +++ b/classes/gitver.bbclass @@ -5,8 +5,13 @@ # for use in ${PV}, extracted from the ${S} git checkout, assuming it is one. # This is most useful in concert with srctree.bbclass. +def git_drop_tag_prefix(version): + if re.match("v\d", version): + return version[1:] + else: + return version -GIT_TAGADJUST = "version" +GIT_TAGADJUST = "git_drop_tag_prefix(version)" GITVER = "${@get_git_pv('${S}', d, tagadjust=lambda version:${GIT_TAGADJUST})}" def get_git_pv(path, d, tagadjust=None):