mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-04 23:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: bitbake: bitbake-layers: checkout layer(s) branch when clone exists

Browse Source 
[YOCTO #7852]

Fixes 'bitbake-layers layerindex-fetch --branch kirkstone meta-arm'
not checking out the branch if the repo is already cloned and on a
different branch.

If a clone of a layer being added already exists check what branch it
is on and if necessary attempt to switch to the given branch. If the
switch fails to happen the git error will be reported. We also warn if
there are uncommitted changes as the changes might go unnoticed and
result in unexpected behaviors.

(Bitbake rev: 138dd7883ee2c521900b29985b6d24a23d96563c)

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d2cb388f58a37db2149fad34e4572d954e6e5441)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Asselstine
2022-11-09 04:29:36 -10:00
committed by Richard Purdie
parent 25f355e0ef
commit 79434a17eb
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bitbake/lib/bblayers/layerindex.py
View File

@@ -49,6 +49,31 @@ class LayerIndexPlugin(ActionPlugin):
else:
logger.plain("Repository %s needs to be fetched" % url)
return subdir, layername, layerdir
elif os.path.exists(repodir) and branch:
"""
If the repo is already cloned, ensure it is on the correct branch,
switching branches if necessary and possible.
"""
base_cmd = ['git', '--git-dir=%s/.git' % repodir, '--work-tree=%s' % repodir]
cmd = base_cmd + ['branch']
completed_proc = subprocess.run(cmd, text=True, capture_output=True)
if completed_proc.returncode:
logger.error("Unable to validate repo %s (%s)" % (repodir, stderr))
return None, None, None
else:
if branch != completed_proc.stdout[2:-1]:
cmd = base_cmd + ['status', '--short']
completed_proc = subprocess.run(cmd, text=True, capture_output=True)
if completed_proc.stdout.count('\n') != 0:
logger.warning("There are uncommitted changes in repo %s" % repodir)
cmd = base_cmd + ['checkout', branch]
completed_proc = subprocess.run(cmd, text=True, capture_output=True)
if completed_proc.returncode:
# Could be due to original shallow clone on a different branch for example
logger.error("Unable to automatically switch %s to desired branch '%s' (%s)"
% (repodir, branch, completed_proc.stderr))
return None, None, None
return subdir, layername, layerdir
elif os.path.exists(layerdir):
return subdir, layername, layerdir
else: