From patchwork Sun Oct 8 03:15:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 13412740 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 C925FE95A82 for ; Sun, 8 Oct 2023 14:26:30 +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.web11.31952.1696734952477941822 for ; Sat, 07 Oct 2023 20:15:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=felix.moessbauer@siemens.com header.s=fm1 header.b=N+zaBMH7; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-72506-202310080315500fada700a795f34e68-taxkvh@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202310080315500fada700a795f34e68 for ; Sun, 08 Oct 2023 05:15:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=gXrHrS2kI4vvCjF8UukET2sEFAf4OPP3z3t0JYOSWMo=; b=N+zaBMH7MkNpBXDTCRe6GcfVs7j+ny3Dl3YG1iITYgmfPXjJUqx0gAOnRWT52UdW42gd7l 8RTnEqYVgAI0giN7p6SpBV28Zr616Qkd6vZdjNJss6o5BSyYzMas3VeQOzeykzg1K1jWmcRy AlgOEqJIKZNvK+nX2xqyQc/0tKnCk=; From: Felix Moessbauer To: cip-dev@lists.cip-project.org Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [isar-cip-core][PATCH 1/4] make deploy-ovmf compatible with schroot imaging Date: Sun, 8 Oct 2023 11:15:26 +0800 Message-Id: <20231008031529.1338834-2-felix.moessbauer@siemens.com> In-Reply-To: <20231008031529.1338834-1-felix.moessbauer@siemens.com> References: <20231008031529.1338834-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506: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 ; Sun, 08 Oct 2023 14:26:30 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/13310 Signed-off-by: Felix Moessbauer --- recipes-core/images/deploy-ovmf.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes-core/images/deploy-ovmf.inc b/recipes-core/images/deploy-ovmf.inc index 0ec8762..cdab118 100644 --- a/recipes-core/images/deploy-ovmf.inc +++ b/recipes-core/images/deploy-ovmf.inc @@ -11,11 +11,15 @@ # This recipe deploys the OVMF binaries to run the image in QEMU # Note: x86 only -IMAGER_INSTALL += "ovmf" +INSTALL_deploy_ovmf_binaries += "ovmf" +do_deploy_ovmf_binaries[network] += "${TASK_USE_SUDO}" do_deploy_ovmf_binaries[cleandirs] += "${DEPLOY_DIR_IMAGE}/OVMF" +do_deploy_ovmf_binaries[depends] += "${SCHROOT_DEP}" do_deploy_ovmf_binaries() { - cp -v ${BUILDCHROOT_DIR}/usr/share/OVMF/*.fd ${DEPLOY_DIR_IMAGE}/OVMF + imager_run -p -d ${PP_WORK} -- <<'EOIMAGER' + cp -v /usr/share/OVMF/*.fd ${PP_DEPLOY}/OVMF/ +EOIMAGER } +addtask deploy_ovmf_binaries before do_image -addtask deploy_ovmf_binaries after do_install_imager_deps before do_image From patchwork Sun Oct 8 03:15:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 13412739 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 D66BBE95A82 for ; Sun, 8 Oct 2023 14:26:20 +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.web10.32144.1696734954816626362 for ; Sat, 07 Oct 2023 20:15:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=felix.moessbauer@siemens.com header.s=fm1 header.b=bIHmFGiB; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-72506-20231008031552d2ec3397c9ff2e6ed4-dojltp@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20231008031552d2ec3397c9ff2e6ed4 for ; Sun, 08 Oct 2023 05:15:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=Ccosiq23TZXww94gb7twmr+34RI1272pUJ9z491JzOk=; b=bIHmFGiBEx0zpdeaVbjVK2+0S5Nzw8pvJt2Mw/lq3MrWVMd7t8ZzwHqqbtIHkwfWG7jwsj 8j3Xdeos1SyNy3GE5hg0gpyEmWIenl/4FC6jWCH7Jk5YJrKAL9NAM/q0M+4aAG0VbiOAbNp3 CAaDQ/cjqKUN6DNk+gbeEYKl2MVug=; From: Felix Moessbauer To: cip-dev@lists.cip-project.org Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [isar-cip-core][PATCH 2/4] make swupdate class compatible with schroot imaging Date: Sun, 8 Oct 2023 11:15:27 +0800 Message-Id: <20231008031529.1338834-3-felix.moessbauer@siemens.com> In-Reply-To: <20231008031529.1338834-1-felix.moessbauer@siemens.com> References: <20231008031529.1338834-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506: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 ; Sun, 08 Oct 2023 14:26:20 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/13308 Signed-off-by: Felix Moessbauer --- classes/swupdate.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index aedaf02..55dad32 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -106,7 +106,7 @@ IMAGE_CMD:swu() { # Prepare for signing export sign='${@'x' if bb.utils.to_boolean(d.getVar('SWU_SIGNED')) else ''}' - sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ + imager_run -p -d ${PP_WORK} <<'EOIMAGER' # Fill in file check sums for file in ${SWU_ADDITIONAL_FILES}; do sed -i "s:$file-sha256:$(sha256sum "${PP_WORK}/swu/"$file | cut -f 1 -d " "):g" \ @@ -138,7 +138,8 @@ IMAGE_CMD:swu() { fi echo "$file.${SWU_SIGNATURE_EXT}" fi - done | cpio -ovL --reproducible -H crc > "${SWU_BUILDCHROOT_IMAGE_FILE}"' + done | cpio -ovL --reproducible -H crc > "${SWU_BUILDCHROOT_IMAGE_FILE}" +EOIMAGER } python do_check_swu_partition_uuids() { From patchwork Sun Oct 8 03:15:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 13412737 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 E5F90E95A67 for ; Sun, 8 Oct 2023 14:26:10 +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.web10.32151.1696735007271705088 for ; Sat, 07 Oct 2023 20:16:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=felix.moessbauer@siemens.com header.s=fm1 header.b=VxGRq28w; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-72506-20231008031644497980d5c2c298f6f9-wcjsxx@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20231008031644497980d5c2c298f6f9 for ; Sun, 08 Oct 2023 05:16:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=aThWi5GSoWzTJNHDXMNoJkRhRTPAWJuvwAKuxX86Tzs=; b=VxGRq28wGuPL4JSeboDRe9fyvuOfG/L6qjkNG5omRBY3NrehKntJwo9ngS5u2cFSTe5+wt kpzdyVBVGPtzrkfHjdR5Zf7YUMRFWu7TtNp+LfxBS7ajlquIc13Vy0eV8vtGoRyYZcBbhrSQ dBoEOHbdJfAiwfhQLYs8NryroXXKM=; From: Felix Moessbauer To: cip-dev@lists.cip-project.org Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [isar-cip-core][PATCH 3/4] avoid use of sudo when creating squashfs Date: Sun, 8 Oct 2023 11:15:28 +0800 Message-Id: <20231008031529.1338834-4-felix.moessbauer@siemens.com> In-Reply-To: <20231008031529.1338834-1-felix.moessbauer@siemens.com> References: <20231008031529.1338834-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506: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 ; Sun, 08 Oct 2023 14:26:10 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/13307 Signed-off-by: Felix Moessbauer --- classes/squashfs.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/squashfs.bbclass b/classes/squashfs.bbclass index bf72133..f57af7e 100644 --- a/classes/squashfs.bbclass +++ b/classes/squashfs.bbclass @@ -51,7 +51,7 @@ python __anonymous() { IMAGE_CMD:squashfs[depends] = "${PN}:do_transform_template" IMAGE_CMD:squashfs[vardepsexclude] += "SQUASHFS_CREATION_LIMITS" IMAGE_CMD:squashfs() { - ${SUDO_CHROOT} /bin/mksquashfs \ + imager_run -p -d ${PP_WORK} -- /bin/mksquashfs \ '${SQUASHFS_CONTENT}' '${IMAGE_FILE_CHROOT}' \ -noappend ${SQUASHFS_CREATION_LIMITS} ${SQUASHFS_CREATION_ARGS} } From patchwork Sun Oct 8 03:15:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 13412741 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 CF9A6E95A8F for ; Sun, 8 Oct 2023 14:26:30 +0000 (UTC) Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net [185.136.65.228]) by mx.groups.io with SMTP id smtpd.web11.31964.1696735008631492730 for ; Sat, 07 Oct 2023 20:16:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=felix.moessbauer@siemens.com header.s=fm1 header.b=HZjSidfS; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.228, mailfrom: fm-72506-20231008031646bc34d11b607e62f101-quex0w@rts-flowmailer.siemens.com) Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20231008031646bc34d11b607e62f101 for ; Sun, 08 Oct 2023 05:16:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=Y9ssTHLRb1jAVge1hhjkUscXzholaT5lEuN1sj7UIms=; b=HZjSidfSNEPNFcwnrXN1AhfYwSubFsHywFM1oswU36vDeREFygmtS+vY/YPKvo/S7lArJG XTSj5TazUITlb5kTG0nlFXrgfef5agny4H6RND2syIqq1fddR5GxXJsT26L72KZWAdppLLnN BDyh3+9RWpLMBEuyebLgkRpJpPM2Y=; From: Felix Moessbauer To: cip-dev@lists.cip-project.org Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [isar-cip-core][PATCH 4/4] update ISAR to latest version on master branch Date: Sun, 8 Oct 2023 11:15:29 +0800 Message-Id: <20231008031529.1338834-5-felix.moessbauer@siemens.com> In-Reply-To: <20231008031529.1338834-1-felix.moessbauer@siemens.com> References: <20231008031529.1338834-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506: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 ; Sun, 08 Oct 2023 14:26:30 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/13311 Signed-off-by: Felix Moessbauer --- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas-cip.yml b/kas-cip.yml index c329248..84b7441 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: bf9c9fdd99bf26dca25fdf9e63b7eb5b053d962f + commit: dff8ad504b54a4e292a1b986cdc74ebc9e6e177a layers: meta: