From: Alexander Kanavin Date: Tue, 7 May 2024 11:46:22 +0000 (+0200) Subject: bblayers/makesetup: include local repository paths in discovered layer repo data X-Git-Tag: uninative-4.6~489 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee33ebf6140ad13e401c2cccbb106a22043be356;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git bblayers/makesetup: include local repository paths in discovered layer repo data This can be useful when the caller needs to know where the repos actually are on local disk (for example to make a local copy of them or obtain additional information about them). This field however should be removed from the json output in oe-setup-layers plugin, as it is host-specific and not part of the schema. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index 8148b0d9ff4..48dc73c288d 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py @@ -76,6 +76,7 @@ class MakeSetupPlugin(LayerPlugin): repos_nopaths[r_nopath] = repos[r] r_relpath = os.path.relpath(r, top_path) repos_nopaths[r_nopath]['path'] = r_relpath + repos_nopaths[r_nopath]['originpath'] = r return repos_nopaths def do_make_setup(self, args): diff --git a/meta/lib/bblayers/setupwriters/oe-setup-layers.py b/meta/lib/bblayers/setupwriters/oe-setup-layers.py index 59ca968ff33..56c929471e6 100644 --- a/meta/lib/bblayers/setupwriters/oe-setup-layers.py +++ b/meta/lib/bblayers/setupwriters/oe-setup-layers.py @@ -85,6 +85,8 @@ class OeSetupLayersWriter(): if not os.path.exists(args.destdir): os.makedirs(args.destdir) repos = parent.make_repo_config(args.destdir) + for r in repos.values(): + del r['originpath'] json = {"version":"1.0","sources":repos} if not repos: err = "Could not determine layer sources"