From cf2fcb00a0f9f7272a4cb0a1260775f312e5f76f Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Mon, 5 Sep 2022 09:37:13 +0200 Subject: [PATCH] Kirkstone migration (#4) (#6) Signed-off-by: Mike Haller Signed-off-by: Stoyan Lachev Co-authored-by: Mike Haller --- .config.yaml | 68 +++++++++++++++++++ .devcontainer/Dockerfile | 39 +++++++++++ .devcontainer/devcontainer.json | 38 +++++++++++ .github/workflows/dryrun.yml | 31 +++++++++ .github/workflows/leda-utils.yml | 49 +++++++++++++ .gitignore | 10 +++ README.md | 52 +++++++++++--- conf/layer.conf | 4 +- docs/manual-bitbake-dryrun.md | 53 +++++++++++++++ docs/setup-kas.md | 19 ++++++ docs/yocto-check-layer.md | 17 +++++ kas/.config-honister.yaml | 68 +++++++++++++++++++ kas/.config-kirkstone.yaml | 68 +++++++++++++++++++ kas/.config-master.yaml | 68 +++++++++++++++++++ meta-leda-bsp/conf/layer.conf | 4 +- meta-leda-components/conf/layer.conf | 2 +- .../recipes-sdv/eclipse-kanto/README.md | 6 ++ .../packagegroup-sdv-additions.bb | 2 +- .../sdv-base/sdv-core-utils_0.1.bb | 4 +- .../vehicle-data-broker-deployment.yaml | 15 +++- meta-leda-distro-container/conf/layer.conf | 2 +- meta-leda-distro/conf/layer.conf | 4 +- 22 files changed, 603 insertions(+), 20 deletions(-) create mode 100644 .config.yaml create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json create mode 100644 .github/workflows/dryrun.yml create mode 100644 .github/workflows/leda-utils.yml create mode 100644 .gitignore create mode 100644 docs/manual-bitbake-dryrun.md create mode 100644 docs/setup-kas.md create mode 100644 docs/yocto-check-layer.md create mode 100644 kas/.config-honister.yaml create mode 100644 kas/.config-kirkstone.yaml create mode 100644 kas/.config-master.yaml create mode 100644 meta-leda-components/recipes-sdv/eclipse-kanto/README.md diff --git a/.config.yaml b/.config.yaml new file mode 100644 index 00000000..2cfdf37d --- /dev/null +++ b/.config.yaml @@ -0,0 +1,68 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ +# Every file needs to contain a header, that provides kas with information +# about the context of this file. +header: + # The `version` entry in the header describes for which configuration + # format version this file was created for. It is used by kas to figure + # out if it is compatible with this file. The version is an integer that + # is increased on every format change. + version: 12 +# The machine as it is written into the `local.conf` of bitbake. +machine: qemux86-64 +# The distro name as it is written into the `local.conf` of bitbake. +distro: leda +target: sdv-image-all +local_conf_header: + meta-leda: | + INHERIT:append = " rm_work" + INHERIT:remove = " archiver" + INHERIT:remove = " cve-check" + INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +repos: + # This entry includes the repository where the config file is located + # to the bblayers.conf: + # Here we include a list of layers from the poky repository to the + # bblayers.conf: + poky: + url: "https://git.yoctoproject.org/git/poky" + refspec: kirkstone + layers: + meta: + meta-poky: + meta-yocto-bsp: + meta-rauc-community: + url: "https://github.com/rauc/meta-rauc-community.git" + refspec: krikstone + layers: + meta-rauc-qemux86: + meta-rauc: + url: "https://github.com/rauc/meta-rauc.git" + refspec: kirkstone + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" + refspec: kirkstone + meta-openembedded: + url: "https://git.openembedded.org/meta-openembedded" + refspec: kirkstone + layers: + meta-oe: + meta-filesystems: + meta-python: + meta-networking: + meta-leda: + path: ./ + layers: + meta-leda-bsp: + meta-leda-components: + meta-leda-distro: diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..6a231712 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,39 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/debian/.devcontainer/base.Dockerfile + +# [Choice] Debian version (use bullseye on local arm64/Apple Silicon): bullseye, buster +ARG VARIANT="buster" +FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} + +# ** [Optional] Uncomment this section to install additional packages. ** +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends + +# Install Dependencies +RUN apt-get update +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends socat file gawk wget git diffstat unzip texinfo \ + gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \ + iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 xterm python3-subunit \ + mesa-common-dev zstd liblz4-tool tmux mc skopeo fdisk ruby-full jq \ + libvirt-clients libvirt-daemon-system qemu-system-x86 qemu-system-arm qemu-kvm \ + squashfs-tools rauc python3-newt + +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certificates \ + curl \ + gnupg \ + lsb-release + +# Install kas tool to set up Yocto build environment +RUN pip3 install kas diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..b244f0c6 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,38 @@ +// ******************************************************************************** +// * Copyright (c) 2022 Contributors to the Eclipse Foundation +// * +// * See the NOTICE file(s) distributed with this work for additional +// * information regarding copyright ownership. +// * +// * This program and the accompanying materials are made available under the +// * terms of the Apache License 2.0 which is available at +// * https://www.apache.org/licenses/LICENSE-2.0 +// * +// * SPDX-License-Identifier: Apache-2.0 +// ********************************************************************************/ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/debian +{ + "name": "Debian", + "build": { + "dockerfile": "Dockerfile", + // Update 'VARIANT' to pick an Debian version: bullseye, buster + // Use bullseye on local arm64/Apple Silicon. + "args": { "VARIANT": "bullseye" } + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker. + // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], + + // Uncomment when using a ptrace-based debugger like C++, Go, and Rust + // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], + + // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode", + "features": { + "github-cli": "latest" + } +} diff --git a/.github/workflows/dryrun.yml b/.github/workflows/dryrun.yml new file mode 100644 index 00000000..ef5a0b7f --- /dev/null +++ b/.github/workflows/dryrun.yml @@ -0,0 +1,31 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +name: BitBake DryRun +on: + push: + workflow_dispatch: + +jobs: + mybranch: + name: Yocto (This Branch) + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install tools + run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool tmux mc skopeo fdisk ruby-full jq libvirt-clients libvirt-daemon-system qemu-system-x86 qemu-system-arm qemu-kvm squashfs-tools rauc python3-newt ca-certificates curl gnupg lsb-release + - name: Install kas + run: sudo pip3 install kas + - name: DryRun sdv-image-all + run: kas build --target sdv-image-all -- --dry-run diff --git a/.github/workflows/leda-utils.yml b/.github/workflows/leda-utils.yml new file mode 100644 index 00000000..f76f5129 --- /dev/null +++ b/.github/workflows/leda-utils.yml @@ -0,0 +1,49 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + +name: Leda-Utils (Full) +on: + pull_request: + workflow_dispatch: + +jobs: + leda-utils: + name: Leda Utils Recipe + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Install tools + run: sudo apt-get install -y --no-install-recommends socat file gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool tmux mc skopeo fdisk ruby-full jq libvirt-clients libvirt-daemon-system qemu-system-x86 qemu-system-arm qemu-kvm squashfs-tools rauc python3-newt ca-certificates curl gnupg lsb-release + - name: Install kas + run: sudo pip3 install kas + - name: Cache Downloads + id: cache-downloads + uses: actions/cache@v3 + with: + path: build/downloads + key: bb-downloads + - name: Cache SState + id: cache-sstate + uses: actions/cache@v3 + with: + path: build/sstate-cache + key: bb-sstate-cache + - name: Cache Local + id: cache-local + uses: actions/cache@v3 + with: + path: build/cache + key: bb-cache-local + - name: Build leda-utils + run: kas build --target sdv-core-utils diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9b7abcf8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +# Build folder generated by running "kas build" +build/ + +# Metalayer folders are created by running "kas build" and we don't +# want to commit them as git submodules. +meta-openembedded +meta-rauc +meta-rauc-community +meta-virtualization +poky \ No newline at end of file diff --git a/README.md b/README.md index f7c62931..41918d84 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/eclipse-leda/meta-leda/BitBake%20DryRun/main?label=main) +![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/eclipse-leda/meta-leda/BitBake%20DryRun/kirkstone?label=kirkstone) +![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/eclipse-leda/meta-leda/BitBake%20DryRun/honister?label=honister) + # OpenEmbedded Meta-Layer for Software Defined Vehicles components This metalayer can be used to integrate software-defined vehicle open source components into a Yocto based build. @@ -6,21 +10,53 @@ It is based on the guidelines documented in the [Yocto Project Documentation](ht # Structure -- Eclipse Leda Quickstart Distribution: `meta-leda/meta-sdv-distro` -- BSP for QEMU and Raspberry Pi: `meta-leda/meta-sdv-bsp` -- SDV Component Recipes: `meta-leda/meta-sdv-components` +- Eclipse Leda Quickstart Distribution: `meta-leda/meta-leda-distro` +- BSP for QEMU and Raspberry Pi: `meta-leda/meta-leda-bsp` +- SDV Component Recipes: `meta-leda/meta-leda-components` Note: `meta-leda` is a [container layer](https://docs.yoctoproject.org/ref-manual/terms.html#term-Container-Layer). +# Usage + +After cloning the repository, add the needed layers to your build configuration, for example: + + bitbake-layers add-layer meta-leda/meta-leda-components + +Enable the `sdv` distro feature by adding the following line to your distro (or local) configuration: + + DISTRO_FEATURES:append = " sdv" + +## Building using kas + +The repository contains an example configuration (`.config.yaml`) for [kas](https://github.com/siemens/kas) . To build the image, simply run the kas build command: + + kas build + # Dependencies This layer depends on - poky -- meta-virtualization -- meta-rauc -- meta-openembedded -- meta-security + - URI: https://git.yoctoproject.org/git/poky + - Branch: kirkstone - meta-rauc-community + - URI: https://github.com/rauc/meta-rauc-community.git + - Branch: krikstone **(Note the typo in the branch name)** + - Layers: + - meta-rauc-qemux86 +- meta-rauc: + - URI: https://github.com/rauc/meta-rauc.git + - Branch: kirkstone +- meta-virtualization: + - URI: https://git.yoctoproject.org/meta-virtualization + - Branch: kirkstone +- meta-openembedded: + - URI: https://git.openembedded.org/meta-openembedded + - Branch: kirkstone + - Layers: + - meta-oe + - meta-filesystems + - meta-python + - meta-networking # License and Copyright @@ -40,7 +76,7 @@ https://www.apache.org/licenses/LICENSE-2.0 The project maintains the following source code repositories: -* https://github.com/eclipse-leda/ +* https://github.com/eclipse-leda/meta-leda ## Cryptography diff --git a/conf/layer.conf b/conf/layer.conf index 136e4d81..7950e4fa 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -21,5 +21,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-leda" BBFILE_PATTERN_meta-leda := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-leda = "7" -LAYERDEPENDS_meta-leda += "core meta-sdv-bsp meta-sdv-components meta-sdv-distro" -LAYERSERIES_COMPAT_meta-leda = "honister" +LAYERDEPENDS_meta-leda += "core meta-leda-bsp meta-leda-components meta-leda-distro" +LAYERSERIES_COMPAT_meta-leda = "kirkstone" diff --git a/docs/manual-bitbake-dryrun.md b/docs/manual-bitbake-dryrun.md new file mode 100644 index 00000000..75b7b578 --- /dev/null +++ b/docs/manual-bitbake-dryrun.md @@ -0,0 +1,53 @@ +# Manual BitBake Install and DryRun + +After creating the DevContainer, set up the build environment by checking out Poky and the required layers + +*Note: This setup is much easier to do with the `kas` tooling. See [Setup with kas](setup-kas.md)* + +Clone Poky and switch to the branch under test: + + git clone git://git.yoctoproject.org/poky + cd poky + git checkout -t origin/kirkstone -b kirkstone + +Pull updates if necessary: + + git config pull.rebase false + git pull + +Set up build environment: + + source oe-init-build-env + +Dry-run a build of the Linux Kernel recipe using BitBake: + + bitbake --dry-run linux-yocto + +Check out dependencies for the meta-leda metalayer: + + cd ${CODESPACE_VSCODE_FOLDER} + git clone -b kirkstone https://github.com/rauc/meta-rauc.git meta-rauc + git clone -b krikstone https://github.com/rauc/meta-rauc-community.git meta-rauc-community + git clone -b kirkstone https://git.yoctoproject.org/meta-virtualization meta-virtualization + git clone -b kirkstone https://git.openembedded.org/meta-openembedded meta-openembedded + +From the `poky/build` directory, add the meta-leda Layer to the BBLAYERS configuration: + + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-rauc + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-rauc-community/meta-rauc-qemux86 + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-openembedded/meta-oe + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-openembedded/meta-filesystems + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-openembedded/meta-python + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-openembedded/meta-networking + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-virtualization + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-leda-components + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-leda-bsp + bitbake-layers add-layer ${CODESPACE_VSCODE_FOLDER}/meta-leda-distro + +Dry-run a build of one of the Leda recipes: + + DISTRO=leda bitbake --dry-run sdv-image-all + +Perform a real build of one of the targets, e.g. the Eclipse Kanto Container Management recipe: + + DISTRO=leda bitbake kanto-container-management diff --git a/docs/setup-kas.md b/docs/setup-kas.md new file mode 100644 index 00000000..d004606f --- /dev/null +++ b/docs/setup-kas.md @@ -0,0 +1,19 @@ +# Installing Kas +If you are using a dev-contaier, kas is already installed. Otherwise use: + + pip3 install kas + +# Setting up build environment using Kas + +Run the following command in the root of the project to check out all dependencies and build the default image `sdv-image-all`: + + kas build + +For building other Yocto releases, different `kas/.config-*.yaml` files can be used in same way: + + kas build kas/.config-master.yaml + +To build a specific target, recipe or image, execute this: + + kas build --target packagegroup-sdv-core + diff --git a/docs/yocto-check-layer.md b/docs/yocto-check-layer.md new file mode 100644 index 00000000..a72a0349 --- /dev/null +++ b/docs/yocto-check-layer.md @@ -0,0 +1,17 @@ +# Verifying the layer structure + +To verify the correct structure of the metalayer, use `yocto-check-layer`: + + cd poky + source oe-init-build-env + yocto-check-layer --no-auto --quiet \ + ../../meta-leda-components \ + ../../meta-leda-bsp \ + ../../meta-leda-distro \ + ../../meta-rauc \ + ../../meta-virtualization \ + ../../meta-openembedded/meta-oe \ + ../../meta-openembedded/meta-filesystems/ \ + ../../meta-openembedded/meta-python/ \ + ../../meta-openembedded/meta-networking/ + diff --git a/kas/.config-honister.yaml b/kas/.config-honister.yaml new file mode 100644 index 00000000..a5a7da88 --- /dev/null +++ b/kas/.config-honister.yaml @@ -0,0 +1,68 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ +# Every file needs to contain a header, that provides kas with information +# about the context of this file. +header: + # The `version` entry in the header describes for which configuration + # format version this file was created for. It is used by kas to figure + # out if it is compatible with this file. The version is an integer that + # is increased on every format change. + version: 12 +# The machine as it is written into the `local.conf` of bitbake. +machine: qemux86-64 +# The distro name as it is written into the `local.conf` of bitbake. +distro: leda +target: sdv-image-all +local_conf_header: + meta-leda: | + INHERIT:append = " rm_work" + INHERIT:remove = " archiver" + INHERIT:remove = " cve-check" + INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +repos: + # This entry includes the repository where the config file is located + # to the bblayers.conf: + # Here we include a list of layers from the poky repository to the + # bblayers.conf: + poky: + url: "https://git.yoctoproject.org/git/poky" + refspec: honister + layers: + meta: + meta-poky: + meta-yocto-bsp: + meta-rauc-community: + url: "https://github.com/rauc/meta-rauc-community.git" + refspec: master + layers: + meta-rauc-qemux86: + meta-rauc: + url: "https://github.com/rauc/meta-rauc.git" + refspec: honister + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" + refspec: honister + meta-openembedded: + url: "https://git.openembedded.org/meta-openembedded" + refspec: honister + layers: + meta-oe: + meta-filesystems: + meta-python: + meta-networking: + meta-leda: + path: ./ + layers: + meta-leda-bsp: + meta-leda-components: + meta-leda-distro: diff --git a/kas/.config-kirkstone.yaml b/kas/.config-kirkstone.yaml new file mode 100644 index 00000000..2cfdf37d --- /dev/null +++ b/kas/.config-kirkstone.yaml @@ -0,0 +1,68 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ +# Every file needs to contain a header, that provides kas with information +# about the context of this file. +header: + # The `version` entry in the header describes for which configuration + # format version this file was created for. It is used by kas to figure + # out if it is compatible with this file. The version is an integer that + # is increased on every format change. + version: 12 +# The machine as it is written into the `local.conf` of bitbake. +machine: qemux86-64 +# The distro name as it is written into the `local.conf` of bitbake. +distro: leda +target: sdv-image-all +local_conf_header: + meta-leda: | + INHERIT:append = " rm_work" + INHERIT:remove = " archiver" + INHERIT:remove = " cve-check" + INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +repos: + # This entry includes the repository where the config file is located + # to the bblayers.conf: + # Here we include a list of layers from the poky repository to the + # bblayers.conf: + poky: + url: "https://git.yoctoproject.org/git/poky" + refspec: kirkstone + layers: + meta: + meta-poky: + meta-yocto-bsp: + meta-rauc-community: + url: "https://github.com/rauc/meta-rauc-community.git" + refspec: krikstone + layers: + meta-rauc-qemux86: + meta-rauc: + url: "https://github.com/rauc/meta-rauc.git" + refspec: kirkstone + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" + refspec: kirkstone + meta-openembedded: + url: "https://git.openembedded.org/meta-openembedded" + refspec: kirkstone + layers: + meta-oe: + meta-filesystems: + meta-python: + meta-networking: + meta-leda: + path: ./ + layers: + meta-leda-bsp: + meta-leda-components: + meta-leda-distro: diff --git a/kas/.config-master.yaml b/kas/.config-master.yaml new file mode 100644 index 00000000..7243a1c2 --- /dev/null +++ b/kas/.config-master.yaml @@ -0,0 +1,68 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ +# Every file needs to contain a header, that provides kas with information +# about the context of this file. +header: + # The `version` entry in the header describes for which configuration + # format version this file was created for. It is used by kas to figure + # out if it is compatible with this file. The version is an integer that + # is increased on every format change. + version: 12 +# The machine as it is written into the `local.conf` of bitbake. +machine: qemux86-64 +# The distro name as it is written into the `local.conf` of bitbake. +distro: leda +target: sdv-image-all +local_conf_header: + meta-leda: | + INHERIT:append = " rm_work" + INHERIT:remove = " archiver" + INHERIT:remove = " cve-check" + INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +repos: + # This entry includes the repository where the config file is located + # to the bblayers.conf: + # Here we include a list of layers from the poky repository to the + # bblayers.conf: + poky: + url: "https://git.yoctoproject.org/git/poky" + refspec: master + layers: + meta: + meta-poky: + meta-yocto-bsp: + meta-rauc-community: + url: "https://github.com/rauc/meta-rauc-community.git" + refspec: master + layers: + meta-rauc-qemux86: + meta-rauc: + url: "https://github.com/rauc/meta-rauc.git" + refspec: master + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" + refspec: master + meta-openembedded: + url: "https://git.openembedded.org/meta-openembedded" + refspec: master + layers: + meta-oe: + meta-filesystems: + meta-python: + meta-networking: + meta-leda: + path: ./ + layers: + meta-leda-bsp: + meta-leda-components: + meta-leda-distro: diff --git a/meta-leda-bsp/conf/layer.conf b/meta-leda-bsp/conf/layer.conf index d723f4ee..fbd2985c 100644 --- a/meta-leda-bsp/conf/layer.conf +++ b/meta-leda-bsp/conf/layer.conf @@ -21,5 +21,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-leda-bsp" BBFILE_PATTERN_meta-leda-bsp := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-leda-bsp = "7" -LAYERDEPENDS_meta-leda-bsp += "meta-sdv-components" -LAYERSERIES_COMPAT_meta-leda-bsp = "honister" +LAYERDEPENDS_meta-leda-bsp += "meta-leda-components" +LAYERSERIES_COMPAT_meta-leda-bsp = "kirkstone" diff --git a/meta-leda-components/conf/layer.conf b/meta-leda-components/conf/layer.conf index 1660f600..ded772a1 100644 --- a/meta-leda-components/conf/layer.conf +++ b/meta-leda-components/conf/layer.conf @@ -28,4 +28,4 @@ BBFILE_PRIORITY_meta-leda-components = "7" LAYERDEPENDS_meta-leda-components += "core rauc virtualization-layer" -LAYERSERIES_COMPAT_meta-leda-components = "honister" +LAYERSERIES_COMPAT_meta-leda-components = "kirkstone" diff --git a/meta-leda-components/recipes-sdv/eclipse-kanto/README.md b/meta-leda-components/recipes-sdv/eclipse-kanto/README.md new file mode 100644 index 00000000..a1732693 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-kanto/README.md @@ -0,0 +1,6 @@ +# Eclipse Kanto Recipes + +These are temporary recipes to build the components of [Eclipse Kanto](https://github.com/eclipse-kanto/) + +These recipes will be replaced by the official recipes located in the [Kanto Metalayer](https://github.com/eclipse-kanto/meta-kanto) + diff --git a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb index 3e51e3ea..83b4e418 100644 --- a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb +++ b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb @@ -20,7 +20,7 @@ SDV_EXTERNAL_DEPENDS = "\ sdv-dapr-binaries \ sdv-initialize-dapr-first-boot \ sdv-helm-binaries \ - sdv-container-databroker \ + sdv-kuksa-val-databroker \ " RDEPENDS:${PN} = "\ diff --git a/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb b/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb index a5952ac2..6f1c949e 100644 --- a/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb +++ b/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb @@ -14,8 +14,8 @@ SUMMARY = "SDV Core Utilities" DESCRIPTION = "Core shell scripts" -SRC_URI = "git://github.com/eclipse-leda/leda-utils;branch=main" -SRCREV = "414b1d085624631dbb670d346807f4e552a90905" +SRC_URI = "git://github.com/eclipse-leda/leda-utils;branch=main;protocol=https" +SRCREV = "64ad53ff4b952735ebc5e051e00aad39938ca4a0" # According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group LICENSE = "Apache-2.0" diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/vehicle-data-broker-deployment.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/vehicle-data-broker-deployment.yaml index b85e4066..872f8c3e 100644 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/vehicle-data-broker-deployment.yaml +++ b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/vehicle-data-broker-deployment.yaml @@ -1,3 +1,16 @@ +# /******************************************************************************** +# * Copyright (c) 2022 Contributors to the Eclipse Foundation +# * +# * See the NOTICE file(s) distributed with this work for additional +# * information regarding copyright ownership. +# * +# * This program and the accompanying materials are made available under the +# * terms of the Apache License 2.0 which is available at +# * https://www.apache.org/licenses/LICENSE-2.0 +# * +# * SPDX-License-Identifier: Apache-2.0 +# ********************************************************************************/ + apiVersion: apps/v1 kind: Deployment metadata: @@ -22,7 +35,7 @@ spec: spec: containers: - name: vehicledatabroker - image: ghcr.io/eclipse-leda/leda-incubator-vehicleapi/databroker:v0.18.0 + image: ghcr.io/eclipse/kuksa.val/databroker:v0.17.0 imagePullPolicy: IfNotPresent ports: - name: default diff --git a/meta-leda-distro-container/conf/layer.conf b/meta-leda-distro-container/conf/layer.conf index 14a7aef4..e2030f04 100644 --- a/meta-leda-distro-container/conf/layer.conf +++ b/meta-leda-distro-container/conf/layer.conf @@ -22,4 +22,4 @@ BBFILE_COLLECTIONS += "meta-leda-distro-container" BBFILE_PATTERN_meta-leda-distro-container := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-leda-distro-container = "7" LAYERDEPENDS_meta-leda-distro-container += "" -LAYERSERIES_COMPAT_meta-leda-distro-container = "honister" +LAYERSERIES_COMPAT_meta-leda-distro-container = "kirkstone" diff --git a/meta-leda-distro/conf/layer.conf b/meta-leda-distro/conf/layer.conf index e1ca3b8b..c9060c59 100644 --- a/meta-leda-distro/conf/layer.conf +++ b/meta-leda-distro/conf/layer.conf @@ -21,5 +21,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-leda-distro" BBFILE_PATTERN_meta-leda-distro := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-leda-distro = "7" -LAYERDEPENDS_meta-leda-distro += "meta-sdv-bsp meta-sdv-components" -LAYERSERIES_COMPAT_meta-leda-distro = "honister" +LAYERDEPENDS_meta-leda-distro += "meta-leda-bsp meta-leda-components" +LAYERSERIES_COMPAT_meta-leda-distro = "kirkstone"