summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2019-12-18 13:45:25 -0500
committerMark Hatle <mark.hatle@kernel.crashing.org>2020-02-14 12:09:23 -0600
commit6a5e4ce74e90ed226bad68c46e6bff734c939c98 (patch)
treebdccddc69eb895ea48208aad6abc8471946dc21c
parentbc84ce7e6542dac1a150b9733411190cff591948 (diff)
downloadbitbake-contrib-mgh/layerindex-fetch.tar.gz
bitbake-contrib-mgh/layerindex-fetch.tar.bz2
bitbake-contrib-mgh/layerindex-fetch.zip
bitbake: layerindex: use branch when specifiedmgh/layerindex-fetch
When currently specified, the branch is used to verify the versioning of the meta layer, but the master branch is checked out. This change allows for the branch to be specified. Now it is easy to specify all of the meta layers being added are of the same version, without having to do it in each individual git tree. Also, it will error if there are branches without a matching version. Finally, this allows for meta layer git trees without a master branch. Signed-off-by: Jon Mason <jdmason@kudzu.us> Minor rework of the patch to use the layerBranch actual_branch since the layerindex referenced branch may be different then the overall release branch. Also adjust the patch to use the default git checkout branch instead of master if no branch was specified. (Some repositories don't have a master branch.) Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
-rw-r--r--lib/bblayers/layerindex.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/bblayers/layerindex.py b/lib/bblayers/layerindex.py
index 57cd9027f6..aa3b682d16 100644
--- a/lib/bblayers/layerindex.py
+++ b/lib/bblayers/layerindex.py
@@ -24,7 +24,7 @@ class LayerIndexPlugin(ActionPlugin):
This class inherits ActionPlugin to get do_add_layer.
"""
- def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer):
+ def get_fetch_layer(self, fetchdir, url, subdir, fetch_layer, branch):
layername = self.get_layer_name(url)
if os.path.splitext(layername)[1] == '.git':
layername = os.path.splitext(layername)[0]
@@ -32,9 +32,13 @@ class LayerIndexPlugin(ActionPlugin):
layerdir = os.path.join(repodir, subdir)
if not os.path.exists(repodir):
if fetch_layer:
- result = subprocess.call(['git', 'clone', url, repodir])
+ cmd = ['git', 'clone', '-b' , branch, url, repodir]
+ if not branch:
+ # Branch really shouldn't be empty, but use the repo default if it is
+ cmd = ['git', 'clone', url, repodir]
+ result = subprocess.call(cmd)
if result:
- logger.error("Failed to download %s" % url)
+ logger.error("Failed to download %s (%s)" % (url, branch))
return None, None, None
else:
return subdir, layername, layerdir
@@ -171,7 +175,8 @@ class LayerIndexPlugin(ActionPlugin):
subdir, name, layerdir = self.get_fetch_layer(fetchdir,
layerBranch.layer.vcs_url,
layerBranch.vcs_subdir,
- not args.show_only)
+ not args.show_only,
+ layerBranch.actual_branch)
if not name:
# Error already shown
return 1