From b16108b47610bf78e5305697476ddbbb025752c3 Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Fri, 9 Dec 2022 14:42:06 +0000 Subject: [PATCH 1/6] Build for components only (non-Leda distros) Signed-off-by: GitHub --- .github/workflows/sdv-core-components.yml | 31 ++++++++++++ kas/.config-components.yaml | 58 +++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 .github/workflows/sdv-core-components.yml create mode 100644 kas/.config-components.yaml diff --git a/.github/workflows/sdv-core-components.yml b/.github/workflows/sdv-core-components.yml new file mode 100644 index 00000000..e60998d0 --- /dev/null +++ b/.github/workflows/sdv-core-components.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: SDV Core +on: + pull_request: + workflow_dispatch: + +jobs: + leda-core: + name: SDV Core + 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 python3-newt ca-certificates curl gnupg lsb-release + - name: Install kas + run: sudo pip3 install kas + - name: Build SDV core components only (poky distro) + run: kas build kas/.config-components.yaml:kas/mirrors.yaml diff --git a/kas/.config-components.yaml b/kas/.config-components.yaml new file mode 100644 index 00000000..8fb22631 --- /dev/null +++ b/kas/.config-components.yaml @@ -0,0 +1,58 @@ +# /******************************************************************************** +# * 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. +target: + - packagegroup-sdv-core +local_conf_header: + needed-features: | + DISTRO_FEATURES += " rauc virtualization" + INHERIT += " rm_work" +repos: + poky: + url: "https://git.yoctoproject.org/git/poky" + refspec: kirkstone + layers: + meta: + meta-poky: + meta-yocto-bsp: + meta-openembedded: + url: "https://git.openembedded.org/meta-openembedded" + refspec: kirkstone + layers: + meta-oe: + meta-filesystems: + meta-python: + meta-networking: + meta-rauc: + url: "https://github.com/rauc/meta-rauc.git" + refspec: kirkstone + meta-virtualization: + url: "https://git.yoctoproject.org/meta-virtualization" + refspec: kirkstone + meta-kanto: + url: "https://github.com/eclipse-kanto/meta-kanto.git" + refspec: kirkstone + meta-leda: + path: ./ + layers: + meta-leda-components: From 1b9abcc3dc00ad4c9b0d83091a2457274b054643 Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Tue, 10 Jan 2023 11:13:34 +0000 Subject: [PATCH 2/6] Apt update Signed-off-by: GitHub --- .github/workflows/sdv-core-components.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sdv-core-components.yml b/.github/workflows/sdv-core-components.yml index e60998d0..0c138b50 100644 --- a/.github/workflows/sdv-core-components.yml +++ b/.github/workflows/sdv-core-components.yml @@ -23,6 +23,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Update apt + run: sudo apt-get update -y - 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 python3-newt ca-certificates curl gnupg lsb-release - name: Install kas From 826beef3a96bcb988887bcbdc5558a92c8ae4e56 Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Tue, 10 Jan 2023 11:35:26 +0000 Subject: [PATCH 3/6] Build all SDV package groups Signed-off-by: GitHub --- kas/.config-components.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kas/.config-components.yaml b/kas/.config-components.yaml index 8fb22631..c0a26927 100644 --- a/kas/.config-components.yaml +++ b/kas/.config-components.yaml @@ -23,6 +23,9 @@ header: # The distro name as it is written into the `local.conf` of bitbake. target: - packagegroup-sdv-core + - packagegroup-sdv-additions + - packagegroup-sdv-examples + - packagegroup-sdv-tools local_conf_header: needed-features: | DISTRO_FEATURES += " rauc virtualization" From 288dabcba8ced309bfcfa4aff763fcd48564d156 Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Tue, 10 Jan 2023 11:35:35 +0000 Subject: [PATCH 4/6] Fix typo gpsd Signed-off-by: GitHub --- .../recipes-sdv/packagegroups/packagegroup-sdv-additions.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a6f6a13d..b6aad35a 100644 --- a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb +++ b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-additions.bb @@ -29,4 +29,4 @@ RDEPENDS:${PN} = "\ " # TODO: For future example applictations: -# gspd gpsd-conf \ No newline at end of file +# gpsd gpsd-conf \ No newline at end of file From 5f97ffbf442981baa510337ce00e6077755f8688 Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Tue, 10 Jan 2023 11:39:00 +0000 Subject: [PATCH 5/6] Fix pylint dependency name Signed-off-by: GitHub --- .github/workflows/sdv-core-components.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdv-core-components.yml b/.github/workflows/sdv-core-components.yml index 0c138b50..3afd675b 100644 --- a/.github/workflows/sdv-core-components.yml +++ b/.github/workflows/sdv-core-components.yml @@ -26,7 +26,7 @@ jobs: - name: Update apt run: sudo apt-get update -y - 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 python3-newt ca-certificates curl gnupg lsb-release + 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 pylint xterm python3-subunit mesa-common-dev zstd liblz4-tool python3-newt ca-certificates curl gnupg lsb-release - name: Install kas run: sudo pip3 install kas - name: Build SDV core components only (poky distro) From c82036dfdbc7f1d767134cca695c21c7e9a95a8b Mon Sep 17 00:00:00 2001 From: Mike Haller Date: Tue, 10 Jan 2023 12:46:21 +0000 Subject: [PATCH 6/6] Fix installed-vs-shipped qa error for non-Leda Signed-off-by: GitHub --- .../recipes-sdv/eclipse-leda/kanto-auto-deployer.inc | 3 ++- meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc index dc37d336..cf3f9871 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer.inc @@ -12,10 +12,11 @@ # ********************************************************************************/ -PACKAGES = "${PN}" +PACKAGES = "${PN} ${PN}-dbg" FILES:${PN} += "${bindir}/kanto-auto-deployer" FILES:${PN} += "${systemd_unitdir}/system/kanto-auto-deployer.service" FILES:${PN} += "${KANTO_MANIFESTS_DIR}" +FILES:${PN}-dbg += "${bindir}/.debug" do_install:append() { cargo_do_install diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc b/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc index 83fd5742..bf65a8dc 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kantui.inc @@ -12,8 +12,9 @@ # ********************************************************************************/ -PACKAGES = "${PN}" +PACKAGES = "${PN} ${PN}-dbg" FILES:${PN} += "${bindir}/kantui" +FILES:${PN}-dbg += "${bindir}/.debug" do_install:append() { cargo_do_install