mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 15:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bblayers/makesetup: move check for existence of git remotes to oe-setup-layers plugin

Browse Source 
This helps when making a local copy of all the layers: it's fine to
not have any remotes configured in that case.

Also correct the mistake in accessing 'contains_this_file' property:
it may not necessarily exist, and if so, it should default to False.

(From OE-Core rev: 639df31e57b7f3da2d475cbae9a79d45755dede6)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-05-07 13:46:23 +02:00
committed by Richard Purdie
parent 8332fd532f
commit 11762e4dc3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/lib/bblayers/makesetup.py
View File

@@ -63,10 +63,6 @@ class MakeSetupPlugin(LayerPlugin):
'describe':oe.buildcfg.get_metadata_git_describe(repo_path)}}
if repo_path == destdir_repo:
repos[repo_path]['contains_this_file'] = True
if not repos[repo_path]['git-remote']['remotes'] and not repos[repo_path]['contains_this_file']:
e = "Layer repository in {path} does not have any remotes configured. Please add at least one with 'git remote add'.".format(path=repo_path)
logger.error(e)
raise Exception(e)
top_path = os.path.commonpath([os.path.dirname(r) for r in repos.keys()])

3
meta/lib/bblayers/setupwriters/oe-setup-layers.py
View File

@@ -86,6 +86,9 @@ class OeSetupLayersWriter():
os.makedirs(args.destdir)
repos = parent.make_repo_config(args.destdir)
for r in repos.values():
if not r['git-remote']['remotes'] and not r.get('contains_this_file', False):
e = "Layer repository in {path} does not have any remotes configured. Please add at least one with 'git remote add'.".format(path=r['originpath'])
raise Exception(e)
del r['originpath']
json = {"version":"1.0","sources":repos}
if not repos: