summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-09-01 20:37:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-02 15:58:26 +0100
commit2bdc042d9c782ce87c4bc70c4b04eacfaec549d4 (patch)
tree58a2ab1eeb66084c1991bcf5b83af542386ec82b /scripts
parentbfa02f71d86880781afb9e985b823c3add459162 (diff)
downloadpoky-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 'scripts')
-rwxr-xr-xscripts/oe-setup-layers10
1 files changed, 0 insertions, 10 deletions
diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers
index cbd2efb5c7..6ecaffed75 100755
--- a/scripts/oe-setup-layers
+++ b/scripts/oe-setup-layers
@@ -18,20 +18,10 @@ import subprocess
18 18
19def _do_checkout(args, json): 19def _do_checkout(args, json):
20 layers = json['sources'] 20 layers = json['sources']
21 buildconfs = []
22 oecorepath = ""
23 for l_name in layers: 21 for l_name in layers:
24 l_data = layers[l_name] 22 l_data = layers[l_name]
25 layerdir = os.path.abspath(os.path.join(args['destdir'], l_data['path'])) 23 layerdir = os.path.abspath(os.path.join(args['destdir'], l_data['path']))
26 24
27 for ll_name in l_data['layers']:
28 if ll_name == 'meta':
29 oecorepath = layerdir
30 ll_data = l_data['layers'][ll_name]
31 if 'buildconfigs' in ll_data:
32 for c in ll_data['buildconfigs']:
33 buildconfs.append(os.path.join(layerdir, ll_data['subpath'], c))
34
35 if 'contains_this_file' in l_data.keys(): 25 if 'contains_this_file' in l_data.keys():
36 force_arg = 'force_bootstraplayer_checkout' 26 force_arg = 'force_bootstraplayer_checkout'
37 if not args[force_arg]: 27 if not args[force_arg]: