From aedcb852ed7ec127dbb4c7cd7655d11f72e0b712 Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Wed, 24 Aug 2016 14:22:33 +0200 Subject: gitpkgv: Fix $GITPKV for a single named git source Recipes that fetch from a single git source, assign a name to this source and do not set SRCREV_FORMAT to this name will always get a GITPKGV value of "default", which causes version-going-backwards QA errors. Fix this by automatically determining a suitable SRCREV_FORMAT from the SRC_URI if none is set explicitly. This code does not run for multiple git sources, because bitbake's fetcher enforces setting SRCREV_FORMAT when multiple version-controlled sources are used. Signed-off-by: Clemens Lang Signed-off-by: Martin Jansa --- meta-oe/classes/gitpkgv.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta-oe/classes') diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass index 4866fac0bd..8cd4bfd1ed 100644 --- a/meta-oe/classes/gitpkgv.bbclass +++ b/meta-oe/classes/gitpkgv.bbclass @@ -61,7 +61,14 @@ def get_git_pkgv(d, use_tags): # format = d.getVar('SRCREV_FORMAT', True) if not format: - format = 'default' + names = [] + for url in ud.values(): + if url.type == 'git' or url.type == 'gitsm': + names.extend(url.revisions.keys()) + if len(names) > 0: + format = '_'.join(names) + else: + format = 'default' found = False for url in ud.values(): -- cgit 1.2.3-korg