diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-09-01 20:37:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-02 15:58:26 +0100 |
commit | 2bdc042d9c782ce87c4bc70c4b04eacfaec549d4 (patch) | |
tree | 58a2ab1eeb66084c1991bcf5b83af542386ec82b /meta/lib/bblayers | |
parent | bfa02f71d86880781afb9e985b823c3add459162 (diff) | |
download | poky-2bdc042d9c782ce87c4bc70c4b04eacfaec549d4.tar.gz |
meta/files/layers.schema.json: drop the layers property
This is a leftover from one of the RFC iterations, where
the property contained available machines, distros and templates.
As all of those were dropped from the final version, there is no
reason to list the layers either anymore.
Normally this would be a backwards incompatible change, but as
the layer setup itself was just merged, I think we can do a quick
fixup :-)
(From OE-Core rev: 64a774de0e154ef81f20853fec903b17d9985a72)
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>
Diffstat (limited to 'meta/lib/bblayers')
-rw-r--r-- | meta/lib/bblayers/makesetup.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index bef6da0ea8..22f89d81a4 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py | |||
@@ -64,13 +64,12 @@ class MakeSetupPlugin(LayerPlugin): | |||
64 | return | 64 | return |
65 | repo_path = self._get_repo_path(l_path) | 65 | repo_path = self._get_repo_path(l_path) |
66 | if repo_path not in repos.keys(): | 66 | if repo_path not in repos.keys(): |
67 | repos[repo_path] = {'path':os.path.basename(repo_path),'layers':{},'git-remote':{'rev':l_rev, 'branch':l_branch, 'remotes':self._get_remotes(repo_path), 'describe':self._get_describe(repo_path)}} | 67 | repos[repo_path] = {'path':os.path.basename(repo_path),'git-remote':{'rev':l_rev, 'branch':l_branch, 'remotes':self._get_remotes(repo_path), 'describe':self._get_describe(repo_path)}} |
68 | if repo_path == destdir_repo: | 68 | if repo_path == destdir_repo: |
69 | repos[repo_path]['contains_this_file'] = True | 69 | repos[repo_path]['contains_this_file'] = True |
70 | if not repos[repo_path]['git-remote']['remotes'] and not repos[repo_path]['contains_this_file']: | 70 | if not repos[repo_path]['git-remote']['remotes'] and not repos[repo_path]['contains_this_file']: |
71 | logger.error("Layer repository in {path} does not have any remotes configured. Please add at least one with 'git remote add'.".format(path=repo_path)) | 71 | logger.error("Layer repository in {path} does not have any remotes configured. Please add at least one with 'git remote add'.".format(path=repo_path)) |
72 | return | 72 | return |
73 | repos[repo_path]['layers'][l_name] = {'subpath':l_path.replace(repo_path,'')[1:]} | ||
74 | 73 | ||
75 | top_path = os.path.commonpath([os.path.dirname(r) for r in repos.keys()]) | 74 | top_path = os.path.commonpath([os.path.dirname(r) for r in repos.keys()]) |
76 | 75 | ||