From patchwork Fri Aug 5 15:26:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12937404 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 56999C3F6B0 for ; Fri, 5 Aug 2022 15:26:31 +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.web12.8315.1659713188529128074 for ; Fri, 05 Aug 2022 08:26:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=OvV8DbF6; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-51332-20220805152625b1bad30d4aa96d1fdd-n5brou@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20220805152625b1bad30d4aa96d1fdd for ; Fri, 05 Aug 2022 17:26:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=usPJp8Ce+5WyF+/ccCq95Vl7vcbECvMTIIsm9ynGnUo=; b=OvV8DbF6Zi4LG0eFBS3ynsXpdYeYFPMvCJuxOcQ0DFMcrKFwfAfO33Xqxe0FNl0ThVnsEt Gj42qhV0UMdo/O+wuV87M6pMrM0Nl246oACbEJtISx/dWIKLT7hrqzjyaI+i2j0Rz2QJVl+5 yBJAi9/EtfS3CewSmCJUlnu9lAmfM=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v3 1/2] kas: Remove efibootguard.yml Date: Fri, 5 Aug 2022 17:26:22 +0200 Message-Id: <20220805152623.2155519-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220805152623.2155519-1-Quirin.Gylstorff@siemens.com> References: <20220805152623.2155519-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332: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 ; Fri, 05 Aug 2022 15:26:31 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9137 From: Quirin Gylstorff A build with only the option `kas/efibootguard.yml` will not succeed. Move the content to a include in the image directory and the adapt the kas files. Signed-off-by: Quirin Gylstorff --- conf/distro/cip-core-common.inc | 2 +- kas/opt/ebg-secure-boot-snakeoil.yml | 9 +++---- kas/opt/ebg-swu.yml | 7 ++--- kas/opt/efibootguard.yml | 39 ---------------------------- recipes-core/images/efibootguard.inc | 28 ++++++++++++++++++++ 5 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 kas/opt/efibootguard.yml create mode 100644 recipes-core/images/efibootguard.inc diff --git a/conf/distro/cip-core-common.inc b/conf/distro/cip-core-common.inc index 5cd1603..20a30d2 100644 --- a/conf/distro/cip-core-common.inc +++ b/conf/distro/cip-core-common.inc @@ -11,4 +11,4 @@ KERNEL_NAME ?= "cip" -WKS_FILE ?= "${MACHINE}.wks" +WKS_FILE ??= "${MACHINE}.wks" diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml index 2822cef..0791ea3 100644 --- a/kas/opt/ebg-secure-boot-snakeoil.yml +++ b/kas/opt/ebg-secure-boot-snakeoil.yml @@ -11,16 +11,15 @@ header: version: 10 - includes: - - kas/opt/efibootguard.yml local_conf_header: - image-options-swupdate: | - CIP_IMAGE_OPTIONS_append = " swupdate.inc" + ebg_secureboot_bootloader: | + SWUPDATE_BOOTLOADER = "efibootguard" - swupdate: | + image-options-swupdate: | IMAGE_INSTALL_append = " swupdate" IMAGE_INSTALL_append = " swupdate-handler-roundrobin" + CIP_IMAGE_OPTIONS_append = " swupdate.inc efibootguard.inc" secure-boot-image: | IMAGE_CLASSES += "verity" diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml index 5e4e771..9c50358 100644 --- a/kas/opt/ebg-swu.yml +++ b/kas/opt/ebg-swu.yml @@ -12,12 +12,13 @@ header: version: 10 includes: - - kas/opt/efibootguard.yml - kas/opt/swupdate.yml local_conf_header: + ebg_swu_bootloader: | + SWUPDATE_BOOTLOADER = "efibootguard" + ebg_swu_image_options: | + CIP_IMAGE_OPTIONS_append = " efibootguard.inc image-uuid.inc" initramfs: | INITRAMFS_INSTALL_append = " initramfs-abrootfs-hook" - image-option-uuid: | - CIP_IMAGE_OPTIONS_append = " image-uuid.inc" diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml deleted file mode 100644 index cee9c78..0000000 --- a/kas/opt/efibootguard.yml +++ /dev/null @@ -1,39 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2020 -# -# Authors: -# Quirin Gylstorff -# -# SPDX-License-Identifier: MIT -# -# This kas file adds efibootguard as the bootloader to the image - -header: - version: 10 - -local_conf_header: - efibootguard: | - IMAGE_INSTALL_append = " efibootguard" - - efibootguard-swupdate: | - SWUPDATE_BOOTLOADER = "efibootguard" - - efibootguard-wic: | - WIC_IMAGER_INSTALL_append = " efibootguard" - WDOG_TIMEOUT ?= "60" - WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES" - IMAGE_FSTYPES ?= "wic" - WKS_FILE ?= "${MACHINE}-efibootguard.wks.in" - - firmware-binaries: | - # Add ovmf binaries for qemu - IMAGER_BUILD_DEPS_append_qemu-amd64 += "ovmf-binaries" - # not needed for Debian 11 and later - OVERRIDES_append_qemu-amd64 = ":${BASE_DISTRO_CODENAME}" - DISTRO_APT_SOURCES_append_qemu-amd64_buster = " conf/distro/debian-buster-backports.list" - DISTRO_APT_PREFERENCES_append_qemu-amd64_buster = " conf/distro/preferences.ovmf-snakeoil.conf" - # Add U-Boot for qemu - IMAGER_BUILD_DEPS_append_qemu-arm64 += "u-boot-qemu-arm64" - IMAGER_BUILD_DEPS_append_qemu-arm += "u-boot-qemu-arm" diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc new file mode 100644 index 0000000..d6a7db6 --- /dev/null +++ b/recipes-core/images/efibootguard.inc @@ -0,0 +1,28 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2020 +# +# Authors: +# Quirin Gylstorff +# +# SPDX-License-Identifier: MIT +# + +IMAGE_INSTALL_append = " efibootguard" + +WIC_IMAGER_INSTALL_append = " efibootguard" +WDOG_TIMEOUT ?= "60" +WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES" +WKS_FILE ?= "${MACHINE}-efibootguard.wks.in" +IMAGE_FSTYPES += "wic" + +# Add ovmf binaries for qemu +IMAGER_BUILD_DEPS_append_qemu-amd64 += "ovmf-binaries" +# not needed for Debian 11 and later +OVERRIDES_append_qemu-amd64 = ":${BASE_DISTRO_CODENAME}" +DISTRO_APT_SOURCES_append_qemu-amd64_buster = " conf/distro/debian-buster-backports.list" +DISTRO_APT_PREFERENCES_append_qemu-amd64_buster = " conf/distro/preferences.ovmf-snakeoil.conf" +# Add U-Boot for qemu +IMAGER_BUILD_DEPS_append_qemu-arm64 += "u-boot-qemu-arm64" +IMAGER_BUILD_DEPS_append_qemu-arm += "u-boot-qemu-arm" From patchwork Fri Aug 5 15:26:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12937405 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 575FAC48BE4 for ; Fri, 5 Aug 2022 15:26:31 +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.web09.8330.1659713188194231413 for ; Fri, 05 Aug 2022 08:26:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=hv+AaLGS; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-51332-20220805152625acdbf5be0bdbef85ba-t94qic@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20220805152625acdbf5be0bdbef85ba for ; Fri, 05 Aug 2022 17:26:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=6FTx2ra6JDliLTDzRiRzaftVVVd15oJDGdq2lF3vrgg=; b=hv+AaLGSC66th8hrD/Wv48lzU+fBsjgG3qPYwO0i1w9U65I++7V4ZXhecjl/3eZt2XbYeq ik+ZZVTlL10emueMhEq6XBrOOY9acJrnLNa9Z/SEuGBzRfoBJdvY9UCFZ+KCmAGzq8U+PB+n OvMFrMADRvGu9ns2r+Sd3dw00i4RA=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v3 2/2] kas/opt/swupdate: Move the package installation to swupdate.inc Date: Fri, 5 Aug 2022 17:26:23 +0200 Message-Id: <20220805152623.2155519-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220805152623.2155519-1-Quirin.Gylstorff@siemens.com> References: <20220805152623.2155519-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332: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 ; Fri, 05 Aug 2022 15:26:31 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9135 From: Quirin Gylstorff Signed-off-by: Quirin Gylstorff --- kas/opt/ebg-secure-boot-snakeoil.yml | 2 -- kas/opt/swupdate.yml | 4 ---- recipes-core/images/swupdate.inc | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml index 0791ea3..8adf23d 100644 --- a/kas/opt/ebg-secure-boot-snakeoil.yml +++ b/kas/opt/ebg-secure-boot-snakeoil.yml @@ -17,8 +17,6 @@ local_conf_header: SWUPDATE_BOOTLOADER = "efibootguard" image-options-swupdate: | - IMAGE_INSTALL_append = " swupdate" - IMAGE_INSTALL_append = " swupdate-handler-roundrobin" CIP_IMAGE_OPTIONS_append = " swupdate.inc efibootguard.inc" secure-boot-image: | diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index c2bd15c..8ba03c9 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -15,10 +15,6 @@ header: version: 10 local_conf_header: - swupdate: | - IMAGE_INSTALL_append = " swupdate" - IMAGE_INSTALL_append = " swupdate-handler-roundrobin" - image-option-swupdate: | CIP_IMAGE_OPTIONS_append = " swupdate.inc" diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc index e0252df..edc41a0 100644 --- a/recipes-core/images/swupdate.inc +++ b/recipes-core/images/swupdate.inc @@ -12,6 +12,9 @@ inherit swupdate inherit read-only-rootfs +IMAGE_INSTALL += " swupdate" +IMAGE_INSTALL += " swupdate-handler-roundrobin" + ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.p4.gz" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"