From: Alexander Kanavin <a...@linutronix.de>
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.
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
meta/lib/bblayers/makesetup.py | 4 ----
meta/lib/bblayers/setupwriters/oe-setup-layers.py | 3 +++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py
index 48dc73c288d..4199b5f0698 100644
--- a/meta/lib/bblayers/makesetup.py
+++ b/meta/lib/bblayers/makesetup.py
@@ -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()])
diff --git a/meta/lib/bblayers/setupwriters/oe-setup-layers.py
b/meta/lib/bblayers/setupwriters/oe-setup-layers.py
index 56c929471e6..8faeabfabc8 100644
--- a/meta/lib/bblayers/setupwriters/oe-setup-layers.py
+++ b/meta/lib/bblayers/setupwriters/oe-setup-layers.py
@@ -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:
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199086):
https://lists.openembedded.org/g/openembedded-core/message/199086
Mute This Topic: https://lists.openembedded.org/mt/105958241/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
