summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-02-16 12:52:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-19 11:39:08 +0000
commita4b5a2d5b7ffeb06ddc9594a89efa2fd232b1ad2 (patch)
tree26f44f7bc6057e21adda5a0a073e2359dfc11265 /scripts
parent9813515ff264cc257fa08b0b8f581a0a074a5267 (diff)
downloadpoky-a4b5a2d5b7ffeb06ddc9594a89efa2fd232b1ad2.tar.gz
scripts/oe-setup-layers: write a list of layer paths into the checkout's top dir
This is beneficial for setting up builds, as this list can be used to determine reliably where the actual layers are, and discover available configurations from them. Also adjust the selftest to check the presence of that file rather than any specific layer in a hardcoded location. Sample output (paths are written relative to the file for relocatability and ease of reading): { "layers": [ "meta-openembedded/meta-filesystems", "meta-openembedded/meta-gnome", "meta-openembedded/meta-initramfs", "meta-openembedded/meta-multimedia", "meta-openembedded/meta-networking", "meta-openembedded/meta-oe", "meta-openembedded/meta-perl", "meta-openembedded/meta-python", "meta-openembedded/meta-webserver", "meta-openembedded/meta-xfce", "poky/bitbake/lib/layerindexlib/tests/testdata/layer1", "poky/bitbake/lib/layerindexlib/tests/testdata/layer2", "poky/bitbake/lib/layerindexlib/tests/testdata/layer3", "poky/bitbake/lib/layerindexlib/tests/testdata/layer4", "poky/meta-poky", "poky/meta-selftest", "poky/meta-skeleton", "poky/meta-yocto-bsp", "poky/meta" ], "version": "1.0" } (From OE-Core rev: 82743f4f767f8016564be0d9d6c0d8fe9e067740) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-layers15
1 files changed, 15 insertions, 0 deletions
diff --git a/scripts/oe-setup-layers b/scripts/oe-setup-layers
index 6d49688a32..bee4ef0fec 100755
--- a/scripts/oe-setup-layers
+++ b/scripts/oe-setup-layers
@@ -49,11 +49,24 @@ def _is_repo_at_remote_uri(repodir, remote, uri):
49def _contains_submodules(repodir): 49def _contains_submodules(repodir):
50 return os.path.exists(os.path.join(repodir,".gitmodules")) 50 return os.path.exists(os.path.join(repodir,".gitmodules"))
51 51
52def _write_layer_list(dest, repodirs):
53 layers = []
54 for r in repodirs:
55 for root, dirs, files in os.walk(r):
56 if os.path.basename(root) == 'conf' and 'layer.conf' in files:
57 layers.append(os.path.relpath(os.path.dirname(root), dest))
58 layers_f = os.path.join(dest, ".oe-layers.json")
59 print("Writing list of layers into {}".format(layers_f))
60 with open(layers_f, 'w') as f:
61 json.dump({"version":"1.0","layers":layers}, f, sort_keys=True, indent=4)
62
52def _do_checkout(args, json): 63def _do_checkout(args, json):
53 repos = json['sources'] 64 repos = json['sources']
65 repodirs = []
54 for r_name in repos: 66 for r_name in repos:
55 r_data = repos[r_name] 67 r_data = repos[r_name]
56 repodir = os.path.abspath(os.path.join(args['destdir'], r_data['path'])) 68 repodir = os.path.abspath(os.path.join(args['destdir'], r_data['path']))
69 repodirs.append(repodir)
57 70
58 if 'contains_this_file' in r_data.keys(): 71 if 'contains_this_file' in r_data.keys():
59 force_arg = 'force_bootstraplayer_checkout' 72 force_arg = 'force_bootstraplayer_checkout'
@@ -96,6 +109,8 @@ def _do_checkout(args, json):
96 if _contains_submodules(repodir): 109 if _contains_submodules(repodir):
97 print("Repo {} contains submodules, use 'git submodule update' to ensure they are up to date".format(repodir)) 110 print("Repo {} contains submodules, use 'git submodule update' to ensure they are up to date".format(repodir))
98 111
112 _write_layer_list(args['destdir'], repodirs)
113
99parser = argparse.ArgumentParser(description="A self contained python script that fetches all the needed layers and sets them to correct revisions using data in a json format from a separate file. The json data can be created from an active build directory with 'bitbake-layers create-layers-setup destdir' and there's a sample file and a schema in meta/files/") 114parser = argparse.ArgumentParser(description="A self contained python script that fetches all the needed layers and sets them to correct revisions using data in a json format from a separate file. The json data can be created from an active build directory with 'bitbake-layers create-layers-setup destdir' and there's a sample file and a schema in meta/files/")
100 115
101parser.add_argument('--force-bootstraplayer-checkout', action='store_true', 116parser.add_argument('--force-bootstraplayer-checkout', action='store_true',