From patchwork Tue Oct 4 16:48:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC4CBC4332F for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web09.13318.1664902101744116780 for ; Tue, 04 Oct 2022 09:48:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=SS5VSq0A; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-294854-20221004164819a8a5ea8ab85282ce68-aak75d@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20221004164819a8a5ea8ab85282ce68 for ; Tue, 04 Oct 2022 18:48:19 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=+Qz6xLbS4XfMOwT8SXiB9nLUPHdDS3MSTHzoY1C52qI=; b=SS5VSq0Aw65OndCAU4K3OYIQn7QYvlkWP9EHDsjKiShcqpfcLH0zBsBj6w/z4vfJFo+jjD /8E7NGZdiD38WD3BuYXL36kmGwuAI6E/Z/NNaBG/sx4vc9XJMWi92MHk5ythhO4H20noJ7EV SxS5jN9z8smPfBqStUyXxyI0FZKd8=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 01/12] ci: Allow to set per-project DISTRO_APT_PREMIRRORS Date: Tue, 4 Oct 2022 18:48:07 +0200 Message-Id: <59a3e597e7867bb7f27e53432a9e6af88c4ffba5.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9624 From: Jan Kiszka Can be helpful to work around deb.debian.org glitches, specifically when the distance of a runner to its next mirror is well known. To allow passing this to bitbake, kas has to list this variable explicitly. Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 1 + kas-cip.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce40b5d7..f7c8c889 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ default: - export no_proxy=$NO_PROXY - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY + - export DISTRO_APT_PREMIRRORS=$DISTRO_APT_PREMIRRORS .build_base: stage: build diff --git a/kas-cip.yml b/kas-cip.yml index d005b812..4956da5c 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -41,3 +41,6 @@ local_conf_header: USERS += "root" # 'root' USER_root[password] = "oC3wEGl799tZU" + +env: + DISTRO_APT_PREMIRRORS: "" From patchwork Tue Oct 4 16:48:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998584 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E71D0C07E9D for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web08.13100.1664902102505467263 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=d4HKWZeo; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-294854-2022100416481910d6e4863266921598-lsctdj@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2022100416481910d6e4863266921598 for ; Tue, 04 Oct 2022 18:48:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=nO7NyqL1DCTXSgp19Ge/Wc+IvMXIAT6y1BfQY/mm/9k=; b=d4HKWZeoZrkf+wp54xN21l1v/zbAGjouApyhaRJP/vGcmx2zythVoCaW6EqXzt/GATtbiW sYDduZxu4FUQs/ad3pEourazpf2weZpwuiJNjNu9pjI/IrhsLTPrmSVJgP7WlzBCfOMMUyPM quD5doeEr8IrfuUc2MGqCWPBJr/Jw=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 02/12] Kconfig: Introduce hidden ARCH configs Date: Tue, 4 Oct 2022 18:48:08 +0200 Message-Id: <07ca042a6ed268bd2b6b139f6e4533f0ac19a876.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9628 From: Jan Kiszka Those will allow to model architecture dependencies. No functional changes yet. Signed-off-by: Jan Kiszka --- Kconfig | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Kconfig b/Kconfig index d87e0a6d..561bd9a8 100644 --- a/Kconfig +++ b/Kconfig @@ -1,3 +1,14 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021-2022 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + mainmenu "Isar core layer of the Civil Infrastructure Platform project" config KAS_INCLUDE_MAIN @@ -8,30 +19,49 @@ config KAS_BUILD_SYSTEM string default "isar" +config ARCH_AMD64 + bool + +config ARCH_ARM64 + bool + +config ARCH_ARM + bool + +config ARCH_RISCV64 + bool + choice prompt "Target board" default TARGET_QEMU_AMD64 config TARGET_QEMU_AMD64 bool "QEMU AMD64 (x86-64)" + select ARCH_AMD64 config TARGET_SIMATIC_IPC227E bool "Siemens SIMATIC IPC227E" + select ARCH_AMD64 config TARGET_QEMU_ARM64 bool "QEMU ARM64 (aarch64)" + select ARCH_ARM64 config TARGET_HIHOPE_RZG2M bool "HopeRun HiHope-RZ/G2M" + select ARCH_ARM64 config TARGET_QEMU_ARM bool "QEMU ARM (armhf)" + select ARCH_ARM config TARGET_BBB bool "BeagleBone Black" + select ARCH_ARM config TARGET_IWG20D bool "iWave Systems RainboW-G20D-Qseven" + select ARCH_ARM endchoice From patchwork Tue Oct 4 16:48:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998586 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7483C41535 for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.13110.1664902102058405291 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=ZzWreBEN; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-294854-20221004164820b112cffe4df454d719-hez_yi@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20221004164820b112cffe4df454d719 for ; Tue, 04 Oct 2022 18:48:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=a7Poz7PjJOZqtzT4xADTQYXerEeYKBDnfZp3qoa65S8=; b=ZzWreBENta+Gp7uagx6UrSEgBIeGCGkELeAhnsrKJp8IougzWwZl74MVweSba/AEhqfWcd ieKW4fy1XwF8x7hhwycaIDniYNDuiuz+oxiBervz0rEKDYJF1fewpphMwTRzQhgOvxY1dDMG Jz1RH6BW5omdKsVON3JQ9lQ5upz6Q=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 03/12] Kconfig: Hide kernel 4.4 for arm64 targets Date: Tue, 4 Oct 2022 18:48:09 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9627 From: Jan Kiszka CIP kernel 4.4 does not officially support the arm64 architecture. Signed-off-by: Jan Kiszka --- Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig index 561bd9a8..45637de8 100644 --- a/Kconfig +++ b/Kconfig @@ -83,6 +83,7 @@ choice config KERNEL_4_4 bool "Kernel 4.4.x-cip" + depends on !ARCH_ARM64 config KERNEL_4_19 bool "Kernel 4.19.x-cip" From patchwork Tue Oct 4 16:48:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998582 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D81FDC4167D for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web12.13159.1664902102442526022 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=efxm9h5c; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-294854-2022100416482063c653e4cefcd82a59-1mgxo_@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 2022100416482063c653e4cefcd82a59 for ; Tue, 04 Oct 2022 18:48:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=VTsgqBnA+3Ia3iFXyG5gvjrDSSH50yTF1RgYJiAQEWU=; b=efxm9h5cje+1BVcP2sWB6nCZJGKAbc7MQMr4YJC2sBBHpB6e7kgB+DvQ/kcTMZyPfIFBLN x8pz1IDspLV4z+eorqPK6T5HGROgT/EvYhiOUJawPaAMM/egUlHPov8CDmjIl/elW2/x90nb Cxnp+oI+PIvwYXwux/WuH4RVx0j0Q=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 04/12] start-qemu: Rework usage output Date: Tue, 4 Oct 2022 18:48:10 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9631 From: Jan Kiszka Avoid "echo -e", not supported with all shells. Refactor the environment help to make it better readable. Add missing variables at this chance. Signed-off-by: Jan Kiszka --- start-qemu.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/start-qemu.sh b/start-qemu.sh index bcc7a518..c8d4f47c 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -13,10 +13,13 @@ usage() { echo "Usage: $0 ARCHITECTURE [QEMU_OPTIONS]" - echo -e "\nSet QEMU_PATH environment variable to use a locally " \ - "built QEMU version" - echo -e "\nSet SWUPDATE_BOOT environment variable to boot swupdate image." \ - echo -e "\nSet SECURE_BOOT environment variable to boot a secure boot environment." + echo + echo "Environment variables (default to settings in .config.yml):" + echo " QEMU_PATH use a locally built QEMU version" + echo " SWUPDATE_BOOT boot swupdate image" + echo " SECURE_BOOT start a secure boot environment" + echo " DISTRO_RELEASE select a specific Debian release" + echo " TARGET_IMAGE select a specific image type" exit 1 } From patchwork Tue Oct 4 16:48:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7CE6C43219 for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web12.13160.1664902102669354302 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=UZ5GWj7b; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-294854-20221004164820f968677d0968cd93c5-91nnre@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20221004164820f968677d0968cd93c5 for ; Tue, 04 Oct 2022 18:48:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=UAa7Uydl6itarbojhhY7mU1Yu/SjOKYXal6zZeoyXco=; b=UZ5GWj7bYBtXqoNcqfREbHu0pUWjv+YHlRp0rRIvcgHi9LqMPwo9Y8dhuAhuiN1Nr56osx wYrDp2f0/QSMpfBHZTTAlrwZqULbLBYHaYPAUM/ofVV/udsmkizPa4h6PIy/wuISVhCfRQCL GDquC5t8qxAzn/4wm0/tinh3Ak10E=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 05/12] Bump kas header version to 12 Date: Tue, 4 Oct 2022 18:48:11 +0200 Message-Id: <8bffb54134b3017f4bdd9fa86bd43d0102948e12.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9632 From: Jan Kiszka We already adopted 11 with repo-relative includes. Signed-off-by: Jan Kiszka --- doc/README.secureboot.md | 2 +- kas-cip.yml | 2 +- kas/board/bbb.yml | 2 +- kas/board/hihope-rzg2m.yml | 2 +- kas/board/iwg20m.yml | 2 +- kas/board/qemu-amd64.yml | 2 +- kas/board/qemu-arm.yml | 2 +- kas/board/qemu-arm64.yml | 2 +- kas/board/simatic-ipc227e.yml | 2 +- kas/opt/4.19.yml | 2 +- kas/opt/4.4.yml | 2 +- kas/opt/5.10.yml | 2 +- kas/opt/bullseye.yml | 2 +- kas/opt/buster.yml | 2 +- kas/opt/ebg-secure-boot-snakeoil.yml | 2 +- kas/opt/ebg-swu.yml | 2 +- kas/opt/kernel-panic.yml | 2 +- kas/opt/kernelci.yml | 2 +- kas/opt/rt.yml | 2 +- kas/opt/security.yml | 2 +- kas/opt/swupdate.yml | 2 +- kas/opt/targz-img.yml | 2 +- kas/opt/test.yml | 2 +- kas/opt/wic-targz-img.yml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/README.secureboot.md b/doc/README.secureboot.md index 319b4db0..b6ad9e06 100644 --- a/doc/README.secureboot.md +++ b/doc/README.secureboot.md @@ -145,7 +145,7 @@ kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-secure-boot For user-generated keys, create a new option file in the repository. This option file could look like this: ``` header: - version: 10 + version: 12 includes: - kas/opt/ebg-secure-boot-base.yml diff --git a/kas-cip.yml b/kas-cip.yml index 4956da5c..6b9d5a23 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 distro: cip-core-bullseye target: cip-core-image diff --git a/kas/board/bbb.yml b/kas/board/bbb.yml index 13f0a7f6..c99d9bd4 100644 --- a/kas/board/bbb.yml +++ b/kas/board/bbb.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 machine: bbb diff --git a/kas/board/hihope-rzg2m.yml b/kas/board/hihope-rzg2m.yml index 9d11bb6b..7b80de7c 100644 --- a/kas/board/hihope-rzg2m.yml +++ b/kas/board/hihope-rzg2m.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 machine: hihope-rzg2m diff --git a/kas/board/iwg20m.yml b/kas/board/iwg20m.yml index 2e74ad13..c873b987 100644 --- a/kas/board/iwg20m.yml +++ b/kas/board/iwg20m.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 machine: iwg20m diff --git a/kas/board/qemu-amd64.yml b/kas/board/qemu-amd64.yml index 06e9e180..f9f57be9 100644 --- a/kas/board/qemu-amd64.yml +++ b/kas/board/qemu-amd64.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 machine: qemu-amd64 diff --git a/kas/board/qemu-arm.yml b/kas/board/qemu-arm.yml index 9bf97283..fe030286 100644 --- a/kas/board/qemu-arm.yml +++ b/kas/board/qemu-arm.yml @@ -11,6 +11,6 @@ # header: - version: 10 + version: 12 machine: qemu-arm diff --git a/kas/board/qemu-arm64.yml b/kas/board/qemu-arm64.yml index 823964d8..55690b3f 100644 --- a/kas/board/qemu-arm64.yml +++ b/kas/board/qemu-arm64.yml @@ -11,6 +11,6 @@ # header: - version: 10 + version: 12 machine: qemu-arm64 diff --git a/kas/board/simatic-ipc227e.yml b/kas/board/simatic-ipc227e.yml index 70cf88e7..82b0ff79 100644 --- a/kas/board/simatic-ipc227e.yml +++ b/kas/board/simatic-ipc227e.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 machine: simatic-ipc227e diff --git a/kas/opt/4.19.yml b/kas/opt/4.19.yml index 5ff16839..5e79223d 100644 --- a/kas/opt/4.19.yml +++ b/kas/opt/4.19.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 local_conf_header: kernel-version: | diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml index 65a47757..970351ac 100644 --- a/kas/opt/4.4.yml +++ b/kas/opt/4.4.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 local_conf_header: kernel-version: | diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml index 612b7f9e..2258575c 100644 --- a/kas/opt/5.10.yml +++ b/kas/opt/5.10.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 local_conf_header: kernel-version: | diff --git a/kas/opt/bullseye.yml b/kas/opt/bullseye.yml index 24a4c848..b08e0e41 100644 --- a/kas/opt/bullseye.yml +++ b/kas/opt/bullseye.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 distro: cip-core-bullseye diff --git a/kas/opt/buster.yml b/kas/opt/buster.yml index a7621633..9b0b530f 100644 --- a/kas/opt/buster.yml +++ b/kas/opt/buster.yml @@ -10,6 +10,6 @@ # header: - version: 10 + version: 12 distro: cip-core-buster diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml index ff65e99f..f756ceea 100644 --- a/kas/opt/ebg-secure-boot-snakeoil.yml +++ b/kas/opt/ebg-secure-boot-snakeoil.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 includes: - kas/opt/ebg-swu.yml diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml index 8b3ffec4..b534c504 100644 --- a/kas/opt/ebg-swu.yml +++ b/kas/opt/ebg-swu.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 includes: - kas/opt/swupdate.yml diff --git a/kas/opt/kernel-panic.yml b/kas/opt/kernel-panic.yml index 47df7b16..9aac8b24 100644 --- a/kas/opt/kernel-panic.yml +++ b/kas/opt/kernel-panic.yml @@ -11,7 +11,7 @@ # This kas file adds systemd service file to cause kernel panic during system boot. header: - version: 10 + version: 12 local_conf_header: kernel-panic: | diff --git a/kas/opt/kernelci.yml b/kas/opt/kernelci.yml index 9c67864f..b5fadcb9 100644 --- a/kas/opt/kernelci.yml +++ b/kas/opt/kernelci.yml @@ -11,6 +11,6 @@ # SPDX-License-Identifier: MIT # header: - version: 10 + version: 12 target: cip-core-image-kernelci diff --git a/kas/opt/rt.yml b/kas/opt/rt.yml index b8fe6bb6..4b2519f1 100644 --- a/kas/opt/rt.yml +++ b/kas/opt/rt.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 local_conf_header: preempt-rt: | diff --git a/kas/opt/security.yml b/kas/opt/security.yml index 3cf88afa..4e74a9c4 100644 --- a/kas/opt/security.yml +++ b/kas/opt/security.yml @@ -9,6 +9,6 @@ # SPDX-License-Identifier: MIT # header: - version: 10 + version: 12 target: cip-core-image-security diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index 8ba03c9a..ea8bac3d 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -12,7 +12,7 @@ # from the first wic partition header: - version: 10 + version: 12 local_conf_header: image-option-swupdate: | diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml index afe2e074..8283ef88 100644 --- a/kas/opt/targz-img.yml +++ b/kas/opt/targz-img.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 local_conf_header: image-type: | diff --git a/kas/opt/test.yml b/kas/opt/test.yml index ee481966..411582bd 100644 --- a/kas/opt/test.yml +++ b/kas/opt/test.yml @@ -9,7 +9,7 @@ # header: - version: 10 + version: 12 local_conf_header: testing: | diff --git a/kas/opt/wic-targz-img.yml b/kas/opt/wic-targz-img.yml index aaee76d8..3d908de6 100644 --- a/kas/opt/wic-targz-img.yml +++ b/kas/opt/wic-targz-img.yml @@ -10,7 +10,7 @@ # header: - version: 10 + version: 12 # lava uses nfs to deploy the image. For this we need a tarball instead of # full image From patchwork Tue Oct 4 16:48:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998581 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7004C43217 for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web08.13101.1664902102812122600 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=Gl8FUHt0; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-294854-20221004164820eed4f3204a1a40508d-cofgjf@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20221004164820eed4f3204a1a40508d for ; Tue, 04 Oct 2022 18:48:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=KsEorT5UI6XaKUNexi/qrkqRfT45b7TjN2yJ2FskiI4=; b=Gl8FUHt01H0MoKYobEVZGSfn6f8x35RUfr0Jk+003E6nNZ9jJ2+iTO7OASPzf0dSMpVpg+ 6jCJs/bWBUpXOIs49nosYYmrflenWww9JV2MVe/64amyKyhrA+9dINpxYZcyum7dtvURe88r bFm3kkJzry0X4EOn9gAiYFck4SnKU=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 06/12] kas: Drop defaults from bblayers_conf_header Date: Tue, 4 Oct 2022 18:48:12 +0200 Message-Id: <5c26edf44010157edd7f9ea62691a0950e87d88c.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9630 From: Jan Kiszka Already set by kas since revision 11. Signed-off-by: Jan Kiszka --- kas-cip.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/kas-cip.yml b/kas-cip.yml index 6b9d5a23..6efdce98 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -29,8 +29,6 @@ repos: bblayers_conf_header: standard: | LCONF_VERSION = "6" - BBPATH = "${TOPDIR}" - BBFILES ?= "" local_conf_header: standard: | From patchwork Tue Oct 4 16:48:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998578 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8546C4321E for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.web12.13161.1664902103326776206 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=HCVo9Ob9; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-294854-20221004164821b4b1045d07e2b5542b-_thb5f@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221004164821b4b1045d07e2b5542b for ; Tue, 04 Oct 2022 18:48:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=Qy4hvZzTqb35U3nTmNCuZ/YZRw0ZT5hXTrCFrI2gq3E=; b=HCVo9Ob9NWVInGZ64eeZevwT02a5dhPyIhObpq6CX6xX4xQZ08f6FFGK0FAeHQJuAXHIYU gQ7YWdb3QrW35PMlYNc6lx96TWTGnSvFft4PiH5zFC84HhGXiYRAseWPlbQIvXQWLjNPImxb IHMfmAD631Y9aMyDIz39zrhcZBq4s=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 07/12] linux-cip: Update to 4.19.259-cip82, 5.10.145-cip17 and 5.10.145-cip17-rt7 Date: Tue, 4 Oct 2022 18:48:13 +0200 Message-Id: <6a93151acb220ad2c618395eb42722fdd6a75a46.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9633 From: Jan Kiszka Signed-off-by: Jan Kiszka --- ...5.10.140-cip16-rt6.bb => linux-cip-rt_5.10.145-cip17-rt7.bb} | 2 +- ...{linux-cip_4.19.257-cip81.bb => linux-cip_4.19.259-cip82.bb} | 2 +- ...{linux-cip_5.10.140-cip16.bb => linux-cip_5.10.145-cip17.bb} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename recipes-kernel/linux/{linux-cip-rt_5.10.140-cip16-rt6.bb => linux-cip-rt_5.10.145-cip17-rt7.bb} (72%) rename recipes-kernel/linux/{linux-cip_4.19.257-cip81.bb => linux-cip_4.19.259-cip82.bb} (72%) rename recipes-kernel/linux/{linux-cip_5.10.140-cip16.bb => linux-cip_5.10.145-cip17.bb} (72%) diff --git a/recipes-kernel/linux/linux-cip-rt_5.10.140-cip16-rt6.bb b/recipes-kernel/linux/linux-cip-rt_5.10.145-cip17-rt7.bb similarity index 72% rename from recipes-kernel/linux/linux-cip-rt_5.10.140-cip16-rt6.bb rename to recipes-kernel/linux/linux-cip-rt_5.10.145-cip17-rt7.bb index fc895db1..0cb2a1dd 100644 --- a/recipes-kernel/linux/linux-cip-rt_5.10.140-cip16-rt6.bb +++ b/recipes-kernel/linux/linux-cip-rt_5.10.145-cip17-rt7.bb @@ -13,4 +13,4 @@ require linux-cip-rt-common.inc KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" -SRC_URI[sha256sum] = "a59d2994a826c0a1a62e8631f482c6caa98faf87355d7b47868ce7ce17c2e9ce" +SRC_URI[sha256sum] = "a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289" diff --git a/recipes-kernel/linux/linux-cip_4.19.257-cip81.bb b/recipes-kernel/linux/linux-cip_4.19.259-cip82.bb similarity index 72% rename from recipes-kernel/linux/linux-cip_4.19.257-cip81.bb rename to recipes-kernel/linux/linux-cip_4.19.259-cip82.bb index 10676722..d728e2bf 100644 --- a/recipes-kernel/linux/linux-cip_4.19.257-cip81.bb +++ b/recipes-kernel/linux/linux-cip_4.19.259-cip82.bb @@ -13,4 +13,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip" -SRC_URI[sha256sum] = "9337fca3b8f981bd26884a3fd1035296ce5db8b458c776b73114e3e476423737" +SRC_URI[sha256sum] = "b29e7d90959b29c67a0afa4432937fcc51138b519d33f24ff2ce976fbd958ffd" diff --git a/recipes-kernel/linux/linux-cip_5.10.140-cip16.bb b/recipes-kernel/linux/linux-cip_5.10.145-cip17.bb similarity index 72% rename from recipes-kernel/linux/linux-cip_5.10.140-cip16.bb rename to recipes-kernel/linux/linux-cip_5.10.145-cip17.bb index 9ed9ea6c..b4bf6b7b 100644 --- a/recipes-kernel/linux/linux-cip_5.10.140-cip16.bb +++ b/recipes-kernel/linux/linux-cip_5.10.145-cip17.bb @@ -13,4 +13,4 @@ require linux-cip-common.inc KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip" -SRC_URI[sha256sum] = "0bc556457854220e82e6e4f738ddccf92875817f28a0d0643d005fa9038935d0" +SRC_URI[sha256sum] = "4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee" From patchwork Tue Oct 4 16:48:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9F4DC433F5 for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web08.13102.1664902104435926368 for ; Tue, 04 Oct 2022 09:48:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=Ldz6D4TK; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-294854-20221004164821a5013a3e79eca89e58-5xaamx@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20221004164821a5013a3e79eca89e58 for ; Tue, 04 Oct 2022 18:48:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=SBzge6eXTnalOeZEOONt7FaPfDycX04tsHWuPk4u0Ik=; b=Ldz6D4TKFYGFdec5L3gsKHTvlJRvyMiGWVAN8adZeLSWxE8+iLmiyrAVuiGly8AL8wW1Ur mxmxbTt3WDKS03Kw8mQhvKS4seT3WtsbMXoY9seKJYlzyuG2V88jxm6B/WraZxKwN6nbGEkV aV9o353GxXTyzdyBzKDTnKxED6OcI=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 08/12] Update Isar revision Date: Tue, 4 Oct 2022 18:48:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9636 From: Jan Kiszka Brings a couple of smaller fixes. None of them should have direct impact on this layer, but possibly on downstreams. Signed-off-by: Jan Kiszka --- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas-cip.yml b/kas-cip.yml index 6efdce98..24062c50 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: 8dfa97cf6e25a7adec2e02c50c5ef6329f31931b + refspec: 0daa55195f0f55465a367aec1ceeec5f26c161af layers: meta: From patchwork Tue Oct 4 16:48:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C966DC4167B for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web12.13162.1664902103537838386 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=SFh4nhDM; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-294854-20221004164821973439d2e681757306-lj7zmn@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20221004164821973439d2e681757306 for ; Tue, 04 Oct 2022 18:48:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=NKfgz0U7i645MEy7ODAVizDcnw+Jm7bJ/ulM1LQtea4=; b=SFh4nhDMy50pX/7Iu0rlgFlMbjjoXvAVat0q+l3LmIGrJri8MBJHPR2exmKnVSu4dmsg1v TSdE+zqpYQG0+FF8TrHyUadUq/GTgCBJBKioxuZA9ffEPtiE04viYvnmmZEoMkxxokb9yi6y pdSHRmH8LLz+iG28M9qBO7OP+wXvM=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 09/12] deploy-cip-core: Use multi-threaded compression Date: Tue, 4 Oct 2022 18:48:15 +0200 Message-Id: <08ca2d8f2f589ff3cbea3be8352379ebbad660a1.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9634 From: Jan Kiszka Should accelerate this step a bit. Signed-off-by: Jan Kiszka --- scripts/deploy-cip-core.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh index 1eb93d59..ab984686 100755 --- a/scripts/deploy-cip-core.sh +++ b/scripts/deploy-cip-core.sh @@ -30,7 +30,7 @@ S3_TARGET=s3://download2.cip-project.org/cip-core/$REF/$TARGET/ if [ -f $BASE_PATH.wic ] ; then echo "Compressing $BASE_FILENAME.wic..." - xz -9 -k $BASE_PATH.wic + xz -9 -k -T0 $BASE_PATH.wic echo "Uploading artifacts..." aws s3 cp --no-progress --acl public-read $BASE_PATH.wic.xz ${S3_TARGET} From patchwork Tue Oct 4 16:48:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998576 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB605C433FE for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.13111.1664902103763325993 for ; Tue, 04 Oct 2022 09:48:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=K7odvW9H; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-294854-20221004164821860b2fb828f5ca1e17-cerofg@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20221004164821860b2fb828f5ca1e17 for ; Tue, 04 Oct 2022 18:48:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=+48DsQTcS4eHf5EH+qhGY1ZDRq5wTuusdxzqzYoIsAI=; b=K7odvW9H8ZTH8fnAwl3EQyza143vuYZT7iW+aVALIeuIy3i9qBz2pLYrWlERd62B3B7Wpz jQYX/Hp40n7D3g8iWmE8ub0cJ9rskWLMt4v6vM60twRsnu+ys/BN7MPcd7HhhxIk8BFe4pHb xbkNi99+Ri9I/t2YYdSlEQC3LhW1A=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 10/12] Add qemu-riscv64 target Date: Tue, 4 Oct 2022 18:48:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9635 From: Jan Kiszka RISC-V is not yet an official Debian port, so we need to pick sid-ports as source. And that means things can break randomly, as today. Therefore pick a version that builds and runs from snapshot.d.o. Note that fetching from snapshot.d.o can be slow due to throttling or may even fail. Let's hope things will get stable with bookworm. Signed-off-by: Jan Kiszka --- Kconfig | 16 +++++++++++++++- conf/distro/cip-core-sid-ports.conf | 16 ++++++++++++++++ conf/distro/debian-sid-ports.list | 2 ++ conf/distro/debian-sid.list | 2 ++ conf/machine/qemu-riscv64.conf | 15 +++++++++++++++ kas/board/qemu-riscv64.yml | 12 ++++++++++++ kas/opt/sid-ports.yml | 15 +++++++++++++++ 7 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 conf/distro/cip-core-sid-ports.conf create mode 100644 conf/distro/debian-sid-ports.list create mode 100644 conf/distro/debian-sid.list create mode 100644 conf/machine/qemu-riscv64.conf create mode 100644 kas/board/qemu-riscv64.yml create mode 100644 kas/opt/sid-ports.yml diff --git a/Kconfig b/Kconfig index 45637de8..cd24ce24 100644 --- a/Kconfig +++ b/Kconfig @@ -63,6 +63,10 @@ config TARGET_IWG20D bool "iWave Systems RainboW-G20D-Qseven" select ARCH_ARM +config TARGET_QEMU_RISCV64 + bool "QEMU RISC-V 64-bit (riscv64)" + select ARCH_RISCV64 + endchoice config KAS_INCLUDE_BOARD @@ -74,6 +78,7 @@ config KAS_INCLUDE_BOARD default "kas/board/qemu-arm.yml" if TARGET_QEMU_ARM default "kas/board/bbb.yml" if TARGET_BBB default "kas/board/iwg20m.yml" if TARGET_IWG20D + default "kas/board/qemu-riscv64.yml" if TARGET_QEMU_RISCV64 comment "Kernel options" @@ -83,10 +88,11 @@ choice config KERNEL_4_4 bool "Kernel 4.4.x-cip" - depends on !ARCH_ARM64 + depends on !ARCH_ARM64 && !ARCH_RISCV64 config KERNEL_4_19 bool "Kernel 4.19.x-cip" + depends on !ARCH_RISCV64 config KERNEL_5_10 bool "Kernel 5.10.x-cip" @@ -101,6 +107,7 @@ config KAS_INCLUDE_KERNEL config KERNEL_RT bool "Real-time CIP kernel" + depends on !ARCH_RISCV64 config KAS_INCLUDE_KERNEL_RT string @@ -115,9 +122,15 @@ choice config DEBIAN_BUSTER bool "buster (10)" + depends on !ARCH_RISCV64 config DEBIAN_BULLSEYE bool "bullseye (11)" + depends on !ARCH_RISCV64 + +config DEBIAN_SID_PORTS + bool "sid (unstable) with unofficial ports" + depends on ARCH_RISCV64 endchoice @@ -125,6 +138,7 @@ config KAS_INCLUDE_DEBIAN string default "kas/opt/buster.yml" if DEBIAN_BUSTER default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE + default "kas/opt/sid-ports.yml" if DEBIAN_SID_PORTS comment "Image features" diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf new file mode 100644 index 00000000..0b369bb6 --- /dev/null +++ b/conf/distro/cip-core-sid-ports.conf @@ -0,0 +1,16 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2022 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +require conf/distro/debian-sid-ports.conf +require cip-core-common.inc + +PREFERRED_VERSION_linux-cip ?= "5.10.%" +PREFERRED_VERSION_linux-cip-rt ?= "5.10.%" diff --git a/conf/distro/debian-sid-ports.list b/conf/distro/debian-sid-ports.list new file mode 100644 index 00000000..bf0f7a27 --- /dev/null +++ b/conf/distro/debian-sid-ports.list @@ -0,0 +1,2 @@ +deb [check-valid-until=no] https://snapshot.debian.org/archive/debian-ports/20220925T001806Z sid main +deb-src [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main diff --git a/conf/distro/debian-sid.list b/conf/distro/debian-sid.list new file mode 100644 index 00000000..46d34d76 --- /dev/null +++ b/conf/distro/debian-sid.list @@ -0,0 +1,2 @@ +deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main +deb-src [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220925T001806Z sid main diff --git a/conf/machine/qemu-riscv64.conf b/conf/machine/qemu-riscv64.conf new file mode 100644 index 00000000..f1f3e871 --- /dev/null +++ b/conf/machine/qemu-riscv64.conf @@ -0,0 +1,15 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2022 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +DISTRO_ARCH = "riscv64" + +IMAGE_FSTYPES ?= "ext4" +KERNEL_DEFCONFIG ?= "defconfig" diff --git a/kas/board/qemu-riscv64.yml b/kas/board/qemu-riscv64.yml new file mode 100644 index 00000000..0de158a8 --- /dev/null +++ b/kas/board/qemu-riscv64.yml @@ -0,0 +1,12 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2022 +# +# SPDX-License-Identifier: MIT +# + +header: + version: 12 + +machine: qemu-riscv64 diff --git a/kas/opt/sid-ports.yml b/kas/opt/sid-ports.yml new file mode 100644 index 00000000..2e89f2b7 --- /dev/null +++ b/kas/opt/sid-ports.yml @@ -0,0 +1,15 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2022 +# +# Authors: +# Jan Kiszka +# +# SPDX-License-Identifier: MIT +# + +header: + version: 12 + +distro: cip-core-sid-ports From patchwork Tue Oct 4 16:48:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998585 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB4C6C352AA for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web09.13318.1664902101744116780 for ; Tue, 04 Oct 2022 09:48:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=L/fO0gue; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-294854-20221004164822ab5321f58387e1bef4-46ywdd@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20221004164822ab5321f58387e1bef4 for ; Tue, 04 Oct 2022 18:48:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=NX5vEuVmBoYzQWEBVC+QZUm1ooxSjshHzSEAyoC3lP0=; b=L/fO0gueRc1vPW5ZTN1+t3o0GP0mfyhbFJSHMX+J5uxBy6Dut1Tl5gJlUzczGSZo/YnpXO +brUge2FWC6ljaCU4rocIfDQF6oyWqUTplG4gHtaHaOt7Kaq5g/r/oAtCYaR0fEE51ZlsKAZ l3o/Wk1Ighd4fqvTPcnxW64BnfqRc=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 11/12] customizations: Mask hvc0 console under qemu-riscv64 Date: Tue, 4 Oct 2022 18:48:17 +0200 Message-Id: <7dccbac7b8d8b7af7f991c18335b94b0c236a2d8.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9626 From: Jan Kiszka RISC-V kernels tend to come with a virtual console via SBI. Under QEMU, this is redundant to the serial console that Linux support as well, giving two prompts on the UART. Disable the virtual on via systemd. Signed-off-by: Jan Kiszka --- recipes-core/customizations/customizations.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb index 96e88ddb..c057d576 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/customizations.bb @@ -12,3 +12,11 @@ require common.inc DESCRIPTION = "CIP Core image demo & customizations" + +do_prepare_build_prepend_qemu-riscv64() { + if ! grep -q serial-getty@hvc0.service ${WORKDIR}/postinst; then + # suppress SBI console - overlaps with serial console + echo >> ${WORKDIR}/postinst + echo "systemctl mask serial-getty@hvc0.service" >> ${WORKDIR}/postinst + fi +} From patchwork Tue Oct 4 16:48:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 12998583 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDDB6C4167E for ; Tue, 4 Oct 2022 16:48:28 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web09.13319.1664902101900182118 for ; Tue, 04 Oct 2022 09:48:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=KZEW9JLa; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-294854-20221004164822214635d23f0d4b8498-epqcfc@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20221004164822214635d23f0d4b8498 for ; Tue, 04 Oct 2022 18:48:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=/p1dnJrLXK1DI3YQ/0jze4pNUnCuOqZr+U55aj1g6is=; b=KZEW9JLaGnxd/FsaDhiNZ3a7dmQswkbPgj4ef76tf0JuQwTyMsPpYi6o8E3fMWQYnw4b9i ZsGWtuU+iRdQ3yVQnRoP8bPTGZsQe60MOirxqNR/Ruz+Yl+rkE95Zy9ZozUn2I9PzoXqhdPq +7C042+5B2YSs9K7RkaTDvLIArE68=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 12/12] start-qemu: Add support for RISC-V Date: Tue, 4 Oct 2022 18:48:18 +0200 Message-Id: <698957d5f6c859a353620325fc53a8415370105f.1664902098.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Oct 2022 16:48:28 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9629 From: Jan Kiszka Basically like ARM/ARM64. We just need to list the second console via virtio explicitly as the system will not pick it up automatically. Signed-off-by: Jan Kiszka --- start-qemu.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index c8d4f47c..68c0414a 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -34,7 +34,9 @@ if [ -n "${QEMU_PATH}" ]; then fi if [ -z "${DISTRO_RELEASE}" ]; then - if grep -s -q "DEBIAN_BULLSEYE: true" .config.yaml; then + if grep -s -q "DEBIAN_SID_PORTS: true" .config.yaml; then + DISTRO_RELEASE="sid-ports" + elif grep -s -q "DEBIAN_BULLSEYE: true" .config.yaml; then DISTRO_RELEASE="bullseye" else DISTRO_RELEASE="buster" @@ -100,6 +102,20 @@ case "${arch}" in KERNEL_CMDLINE=" \ root=/dev/vda rw" ;; + rv64|riscv64) + QEMU_ARCH=riscv64 + QEMU=qemu-system-riscv64 + QEMU_EXTRA_ARGS=" \ + -cpu rv64 \ + -smp 4 \ + -machine virt \ + -device virtio-serial-device \ + -device virtconsole,chardev=con -chardev vc,id=con \ + -device virtio-blk-device,drive=disk \ + -device virtio-net-device,netdev=net" + KERNEL_CMDLINE=" \ + console=hvc1 console=ttyS0 root=/dev/vda rw" + ;; ""|--help) usage ;;