From patchwork Thu Sep 1 13:49: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: 12962694 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 AD201ECAAD1 for ; Thu, 1 Sep 2022 13:49:23 +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.web12.12327.1662040155782829968 for ; Thu, 01 Sep 2022 06:49:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=F6f1Cg98; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-294854-2022090113491212f22093be49cc44d8-gkv2pe@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2022090113491212f22093be49cc44d8 for ; Thu, 01 Sep 2022 15:49:13 +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=G3PtPjXvIAFl/LGjKXAb81k6tL5CK+Vjig8c0qudimE=; b=F6f1Cg98OmfBgEki6lh3R34pNBBRhJ9SfW3KhFUgBmJOv2q78IvUyLDBLof7JSwdcvDPrA ne+BQL4p7y0QwAZPz8aIqv6k7ok2d5hq1CaaExbQW5G/LExqbwchE3JFUVj/MCnlGzoG3kji gaHIrewQpPp7DP/wD7lZErxW6hC0c=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 1/3] ci: Switch qemu-amd64-secure-boot-buster to 5.10 kernel Date: Thu, 1 Sep 2022 15:49: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 ; Thu, 01 Sep 2022 13:49:23 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9421 From: Jan Kiszka Since 05dd963af058, 4.19 and older are no longer supported for SWUpdate and secure boot setups. Adjust the configuration accordingly, also because it is now failing to build this invalid combination. Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41af3e9..477ec63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -278,6 +278,7 @@ build:qemu-amd64-secure-boot-buster: extends: - .build_base variables: + base_yaml: "kas-cip.yml:kas/board/${target}.yml:kas/opt/5.10.yml" release: buster target: qemu-amd64 extension: ebg-secure-boot-snakeoil From patchwork Thu Sep 1 13:49: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: 12962693 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 A676CC54EE9 for ; Thu, 1 Sep 2022 13:49:23 +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.web12.12329.1662040156295639267 for ; Thu, 01 Sep 2022 06:49:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=Kl4iyT69; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-294854-20220901134912a44e41c7e61bf4fe8c-qa_d_c@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20220901134912a44e41c7e61bf4fe8c for ; Thu, 01 Sep 2022 15:49:13 +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=hsGvZpaZiq4UwP1IaLvwrqWKGUIvmvBuwq9/P+RD44E=; b=Kl4iyT69fiICRCxA1byOaKt6x40bUKAMhFpB9vHYH0q1WsRwu0DBRurTltGVrVvHVGEB+o o8Qv4HL1KkMRIpLppKuIu8uKu5mc7oKzsIzKau2QbGqb9bdvoyDPX73teaynVvq8tYIZmTtm CwjMzzpIzWvpl7uS4dTgJsGv8GDII=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 2/3] ci: Clean up redundant statements Date: Thu, 1 Sep 2022 15:49:11 +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 ; Thu, 01 Sep 2022 13:49:23 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9420 From: Jan Kiszka We neither need to delete build/tmp anymore (since 3510f8a66f80), nor do we need to set variables to the same value as their default. Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 477ec63..593aee7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,6 @@ default: variables: base_yaml: "kas-cip.yml:kas/board/${target}.yml" script: - - sudo rm -rf build/tmp - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi - if [ "${extension}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi - if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi @@ -204,7 +203,6 @@ build:qemu-amd64-secure-boot: extension: ebg-secure-boot-snakeoil use_rt: disable wic_targz: disable - targz: disable deploy: disable build:qemu-amd64-swupdate: @@ -215,7 +213,6 @@ build:qemu-amd64-swupdate: extension: ebg-swu use_rt: disable wic_targz: disable - targz: disable deploy: disable # secure boot images arm64 @@ -227,7 +224,6 @@ build:qemu-arm64-secure-boot: extension: ebg-secure-boot-snakeoil use_rt: disable wic_targz: disable - targz: disable deploy: disable # secure boot images arm @@ -239,7 +235,6 @@ build:qemu-arm-secure-boot: extension: ebg-secure-boot-snakeoil use_rt: disable wic_targz: disable - targz: disable deploy: disable # buster images @@ -284,5 +279,4 @@ build:qemu-amd64-secure-boot-buster: extension: ebg-secure-boot-snakeoil use_rt: disable wic_targz: disable - targz: disable deploy: disable From patchwork Thu Sep 1 13:49: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: 12962695 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 A6715C0502C for ; Thu, 1 Sep 2022 13:49:23 +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.12414.1662040155653482062 for ; Thu, 01 Sep 2022 06:49:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=jan.kiszka@siemens.com header.s=fm1 header.b=YgA0GtxA; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-294854-20220901134913b844e582fb908e38cc-rnbp4f@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20220901134913b844e582fb908e38cc for ; Thu, 01 Sep 2022 15:49:13 +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=wvsike9cS7sXkCbkKYw+6tyRfPGWY043DQu993+iJX8=; b=YgA0GtxAic0lzjxdc6DueZDXs/FYq4H3upYw7bYLryhrPOeBbOlx2KQUbvEGSU6hg/EuAn YjgLLrP3jX5b0IBSUY3z+ozsE5qRLx1Cg6WDDRkgs6yopJdC1WYuF3TSc092ovMUT38jFNlh xNd+R81hZbhpnCUHTzQL2rcWQYtsc=; From: Jan Kiszka To: cip-dev@lists.cip-project.org Subject: [isar-cip-core][PATCH 3/3] ci: Rename empty extension case Date: Thu, 1 Sep 2022 15:49:12 +0200 Message-Id: <4259a1fd031036e3f9f075044984565c319d6588.1662040151.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 ; Thu, 01 Sep 2022 13:49:23 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/9419 From: Jan Kiszka "none" is clearer than "base". Signed-off-by: Jan Kiszka --- .gitlab-ci.yml | 4 ++-- scripts/deploy-cip-core.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 593aee7..81301e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: ghcr.io/siemens/kas/kas-isar:3.0.2 variables: GIT_STRATEGY: clone release: bullseye - extension: base + extension: none use_rt: enable wic_targz: enable targz: disable @@ -31,7 +31,7 @@ default: base_yaml: "kas-cip.yml:kas/board/${target}.yml" script: - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi - - if [ "${extension}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi + - if [ "${extension}" != "none" ]; then base_yaml="${base_yaml}:kas/opt/${extension}.yml"; fi - if [ "${wic_targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/wic-targz-img.yml"; fi - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh index 01aa494..1eb93d5 100755 --- a/scripts/deploy-cip-core.sh +++ b/scripts/deploy-cip-core.sh @@ -17,7 +17,7 @@ DTB=$4 REF=$5 BASE_FILENAME=cip-core-image-cip-core-$RELEASE-$TARGET -if [ "${EXTENSION}" != "base" ] ; then +if [ "${EXTENSION}" != "none" ] ; then if [ "${EXTENSION}" = "security" ] ; then BASE_FILENAME=cip-core-image-$EXTENSION-cip-core-$RELEASE-$TARGET else