diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 14ba592add1965bd47c17b7d8d933d43c56c54c8..01bfe6d3f12949cc13994808ff9e4a4fca3b6db9 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -50,6 +50,7 @@ .layer-configs: &layer-configs - "meta-cassini-distro/conf/layer.conf" + - "meta-cassini-bsp/conf/layer.conf" - "meta-cassini-tests/conf/layer.conf" .build-common: &build-common diff --git a/.gitlab/ci/yocto-qa.yml b/.gitlab/ci/yocto-qa.yml index 8ee28fc15b739b195d242bd68d1ae73d212517b8..952c22253be07c58605a83020fad92610318a54d 100644 --- a/.gitlab/ci/yocto-qa.yml +++ b/.gitlab/ci/yocto-qa.yml @@ -48,6 +48,6 @@ check-layers: --no-auto-dependency" parallel: matrix: - - LAYER: [meta-cassini-distro, meta-cassini-tests] + - LAYER: [meta-cassini-distro, meta-cassini-bsp, meta-cassini-tests] rules: - !reference [".layer-check:rules", rules] diff --git a/documentation/developer_manual/yocto_layers.rst b/documentation/developer_manual/yocto_layers.rst index 5176fa2b04d9ee2ab187e73f3bf0a74accfdc726..8b696de6fbb505acc8ac291983c1067991706776 100644 --- a/documentation/developer_manual/yocto_layers.rst +++ b/documentation/developer_manual/yocto_layers.rst @@ -7,17 +7,26 @@ Yocto Layers ############ -The ``meta-cassini`` repository provides two layers compatible with the Yocto +The ``meta-cassini`` repository provides three layers compatible with the Yocto Project, in the following sub-directories: + * ``meta-cassini-bsp`` + + A Yocto layer which holds board-specific recipes or append files that + either: + + * will not be upstreamed (Cassini specific modifications) + + * have not been upstreamed yet + * ``meta-cassini-distro`` - Yocto distribution layer providing top-level and general policies for the + A Yocto distribution layer providing top-level and general policies for the Cassini distribution images. * ``meta-cassini-tests`` - Yocto software layer with recipes that include run-time tests to validate + A Yocto software layer with recipes that include run-time tests to validate Cassini functionalities. .. _layer_dependency_overview_label: diff --git a/documentation/images/cassini_layers_deps.png b/documentation/images/cassini_layers_deps.png index c61e0cbcb688e431fc2164dcd64ea15d2fa228f1..3eb5bfbdde2db1bc5c223093b043c5c894b21ff1 100644 Binary files a/documentation/images/cassini_layers_deps.png and b/documentation/images/cassini_layers_deps.png differ diff --git a/documentation/introduction.rst b/documentation/introduction.rst index 9855caac8982aa83638151b29d7b7eb4631ec8bb..d6e632585bba73e8b999f36cc75781cc67c9b21e 100644 --- a/documentation/introduction.rst +++ b/documentation/introduction.rst @@ -129,15 +129,24 @@ The ``meta-cassini`` repository is structured as follows: * ``meta-cassini``: + * ``meta-cassini-bsp`` + + A Yocto layer which holds board-specific recipes or append files that + either: + + * will not be upstreamed (Cassini specific modifications) + + * have not been upstreamed yet + * ``meta-cassini-distro`` - Yocto distribution layer providing top-level and general policies for the - Cassini distribution images. + A Yocto distribution layer providing top-level and general policies for + the Cassini distribution images. * ``meta-cassini-tests`` - Yocto software layer with recipes that include run-time tests to validate - Cassini functionalities. + A Yocto software layer with recipes that include run-time tests to + validate Cassini functionalities. * ``meta-cassini-config`` diff --git a/meta-cassini-bsp/README b/meta-cassini-bsp/README new file mode 100644 index 0000000000000000000000000000000000000000..42a870ad84ea6a4a19a172129855148724a0c1ae --- /dev/null +++ b/meta-cassini-bsp/README @@ -0,0 +1,5 @@ +# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# +# SPDX-License-Identifier: MIT + +See ../README.md diff --git a/meta-cassini-bsp/conf/layer.conf b/meta-cassini-bsp/conf/layer.conf new file mode 100644 index 0000000000000000000000000000000000000000..2dc2014e3702617f1f58744bb93a45dbf1883624 --- /dev/null +++ b/meta-cassini-bsp/conf/layer.conf @@ -0,0 +1,16 @@ +# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# +# SPDX-License-Identifier: MIT + +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# Recipes and append files depend on configured platform +BBFILES_DYNAMIC += " \ + meta-arm-bsp:${LAYERDIR}/meta-arm/meta-arm-bsp/*/*/*.bbappend \ + meta-arm-bsp:${LAYERDIR}/meta-arm/meta-arm-bsp/*/*/*.bb \ +" + +BBFILE_COLLECTIONS += "meta-cassini-bsp" +BBFILE_PATTERN_meta-cassini-bsp = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_meta-cassini-bsp = "kirkstone" diff --git a/meta-cassini-config/kas/include/cassini-base.yml b/meta-cassini-config/kas/include/cassini-base.yml index 5c71e2cbe481c7f0554dfb44b15e6f4083db6eac..77e8ab1a46004682615f0fbbc13decb0ff92a4a4 100644 --- a/meta-cassini-config/kas/include/cassini-base.yml +++ b/meta-cassini-config/kas/include/cassini-base.yml @@ -22,6 +22,7 @@ repos: meta-cassini: layers: meta-cassini-distro: + meta-cassini-bsp: meta-openembedded: url: https://git.openembedded.org/meta-openembedded