From patchwork Thu Aug 4 10:04:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 12936246 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 557A3C19F2B for ; Thu, 4 Aug 2022 10:04:24 +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.3028.1659607454776196721 for ; Thu, 04 Aug 2022 03:04:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=jnzTYpha; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-51332-202208041004112aead5b9cae6fb06ff-7d2ggm@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202208041004112aead5b9cae6fb06ff for ; Thu, 04 Aug 2022 12:04:11 +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=jnzTYphaUtGXEkpI7nc+7SvqhNauNXdHUPQm2uAfwya+PfUUj8WUYogCW86QFe3EZErSIB JMcNkw+tmfbugNEf/zOcNP7l1ZB1HfoUlAgMH74tvMWmNyPeKCsoel93EsJHqgaoNgViv9ix Sz8mJX8n1PZrvZPEgM6Yemvy9D/D8=; From: Quirin Gylstorff To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com Subject: [cip-dev][isar-cip-core][PATCH v2 2/2] kas/opt/swupdate: Move the package installation to swupdate.inc Date: Thu, 4 Aug 2022 12:04:09 +0200 Message-Id: <20220804100409.163990-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20220804100409.163990-1-Quirin.Gylstorff@siemens.com> References: <20220804100409.163990-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 ; Thu, 04 Aug 2022 10:04:24 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9117 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:"