diff options
| author | Clemens Lang <clemens.lang@bmw-carit.de> | 2016-08-24 14:22:33 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-05 13:30:50 +0200 |
| commit | aedcb852ed7ec127dbb4c7cd7655d11f72e0b712 (patch) | |
| tree | 0779b597573d067e8809268b7f501fc4953ccd8e | |
| parent | 996f2969bf7ddbd6ee473d5cfd810410e75fb5a2 (diff) | |
| download | meta-openembedded-aedcb852ed7ec127dbb4c7cd7655d11f72e0b712.tar.gz | |
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 <clemens.lang@bmw-carit.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/classes/gitpkgv.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
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): | |||
| 61 | # | 61 | # |
| 62 | format = d.getVar('SRCREV_FORMAT', True) | 62 | format = d.getVar('SRCREV_FORMAT', True) |
| 63 | if not format: | 63 | if not format: |
| 64 | format = 'default' | 64 | names = [] |
| 65 | for url in ud.values(): | ||
| 66 | if url.type == 'git' or url.type == 'gitsm': | ||
| 67 | names.extend(url.revisions.keys()) | ||
| 68 | if len(names) > 0: | ||
| 69 | format = '_'.join(names) | ||
| 70 | else: | ||
| 71 | format = 'default' | ||
| 65 | 72 | ||
| 66 | found = False | 73 | found = False |
| 67 | for url in ud.values(): | 74 | for url in ud.values(): |
