mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

combo-layer: add sync-revs command

Browse Source 
When starting to use combo-layer, or if someone else is using it too,
the local last_revision may be incorrect.

This command will forcibly update the last_revision config values to the
latest SHA on the remote branch that is tracked.

(From OE-Core rev: 8c681c9e56065fac26088b4d2c7f22c09088a9b5)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2bb5d12ecd1b0273983f7c05699f34dd64b11c25)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-12-07 16:36:50 +00:00
committed by Richard Purdie
parent 313c607b8f
commit 5cc264f176
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/combo-layer
View File

@@ -191,6 +191,23 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None):
logger.debug("output: %s" % output.replace(chr(0), '\\0'))
return output
def action_sync_revs(conf, args):
"""
Update the last_revision config option for each repo with the latest
revision in the remote's branch. Useful if multiple people are using
combo-layer.
"""
repos = get_repos(conf, args[1:])
for name in repos:
repo = conf.repos[name]
ldir = repo['local_repo_dir']
branch = repo.get('branch', "master")
runcmd("git fetch", ldir)
lastrev = runcmd('git rev-parse origin/%s' % branch, ldir).strip()
print("Updating %s to %s" % (name, lastrev))
conf.update(name, "last_revision", lastrev)
def action_init(conf, args):
"""
Clone component repositories
@@ -1301,6 +1318,7 @@ actions = {
"update": action_update,
"pull": action_pull,
"splitpatch": action_splitpatch,
"sync-revs": action_sync_revs,
}
def main():
@@ -1311,10 +1329,11 @@ def main():
Create and update a combination layer repository from multiple component repositories.
Action:
init initialise the combo layer repo
update [components] get patches from component repos and apply them to the combo repo
pull [components] just pull component repos only
splitpatch [commit] generate commit patch and split per component, default commit is HEAD""")
init initialise the combo layer repo
update [components] get patches from component repos and apply them to the combo repo
pull [components] just pull component repos only
sync-revs [components] update the config file's last_revision for each repository
splitpatch [commit] generate commit patch and split per component, default commit is HEAD""")
parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).",
action = "store", dest = "conffile", default = "conf/combo-layer.conf")