[oe] [meta-oe][zeus][PATCH 2/2] gitpkgv.bbclass: Add support for extending the supported tag formats
akuster808
akuster808 at gmail.com
Fri Jan 31 17:32:18 UTC 2020
On 1/30/20 1:04 PM, Peter Kjellerstedt wrote:
> Introduce GITPKGV_TAG_REGEXP (which defaults to "v(\d.*)") to support
> dropping other unwanted parts of the found tags than just a leading
> "v". Any matching groups in the regexp will be concatenated to yield
> the final version.
I believe I got this one already staged.
https://git.openembedded.org/meta-openembedded-contrib/commit/?h=stable/zeus-nut&id=b95100003df03c22eebe6ae5e4342b5281a2ef64
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
> meta-oe/classes/gitpkgv.bbclass | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass
> index ab591bd45..180421ed3 100644
> --- a/meta-oe/classes/gitpkgv.bbclass
> +++ b/meta-oe/classes/gitpkgv.bbclass
> @@ -40,10 +40,16 @@
> GITPKGV = "${@get_git_pkgv(d, False)}"
> GITPKGVTAG = "${@get_git_pkgv(d, True)}"
>
> -def gitpkgv_drop_tag_prefix(version):
> +# This regexp is used to drop unwanted parts of the found tags. Any matching
> +# groups will be concatenated to yield the final version.
> +GITPKGV_TAG_REGEXP ??= "v(\d.*)"
> +
> +def gitpkgv_drop_tag_prefix(d, version):
> import re
> - if re.match("v\d", version):
> - return version[1:]
> +
> + m = re.match(d.getVar('GITPKGV_TAG_REGEXP'), version)
> + if m:
> + return ''.join(group for group in m.groups() if group)
> else:
> return version
>
> @@ -105,7 +111,7 @@ def get_git_pkgv(d, use_tags):
> output = bb.fetch2.runfetchcmd(
> "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)
> + ver = gitpkgv_drop_tag_prefix(d, output)
> except Exception:
> ver = "0.0-%s-g%s" % (commits, vars['rev'][:7])
> else:
More information about the Openembedded-devel
mailing list