From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7261955842613706752 X-Received: by 2002:aa7:d85a:0:b0:515:1e50:5498 with SMTP id f26-20020aa7d85a000000b005151e505498mr8061639eds.15.1690805855560; Mon, 31 Jul 2023 05:17:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:1051:b0:51b:d432:a176 with SMTP id e17-20020a056402105100b0051bd432a176ls57993edu.2.-pod-prod-00-eu; Mon, 31 Jul 2023 05:17:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlF+X/T50EiXSYm7D0Dy82JJeLAxGuUHCpkMyEP0na9ao5UhigRRdaFv5pA+nZWNZSo79XVw X-Received: by 2002:aa7:d0ce:0:b0:522:582c:f427 with SMTP id u14-20020aa7d0ce000000b00522582cf427mr10641612edo.14.1690805853504; Mon, 31 Jul 2023 05:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690805853; cv=none; d=google.com; s=arc-20160816; b=ZQpVHPvcrysnNrEXgU004am/AAsReGVMLjf0/XzXNfw0riksD4AKx89C98wmGGVglG qCSvKF4RHH+Z21VF8SXmburltqwXsavtsxxulAMcEzmowgH6XywsdrCldvdzl0/frMj+ tRaKrmkdNpV4tx6ao+gctrCPwh7ZR9bw2FlnCf792/Gapd6rZbFevZNyeVVBKzIx5MNn wjpIMhOdLcNpaxhH3eYgbROVd38eOnVFSpg15vXCrArcgOETpSTpMs/WfN0lwHbPB4jT Hhp9/GneZXtrPHi8eh/Kz1q1u5SItKwTsegxhs26sYuTk2exJfAcxGr83MUMPWG3zdPa 3e1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=ia17thrEW7QNPmSlJ5CXtNgwLsfQBeisFE3VGJUmQk8=; fh=swRs1+OhWjovx1IrvOlKBWsdq9manB5qdcuGoHoh5Ak=; b=hZK+AsQFU5Ke4j/2eJf/0DArKFdq2pr4eNZNZ7P7UBiQphRskRPPmzJUNZvFDhu4Sk +C+rHOF/9l61BOBf3Tna6XxFQVIKChyFInqOnUd+6bfUpm1nHmxJQnCeQrngZGYaxlv6 HPFxNM8EljGTWdnifFZakC5fMp0vgAVwwhCGCWA4NKOcvT3m1H63MSGX2AvKwVJyUeBH ur41mXeuRw/dIAPMQ5A5PLG6GX3uqb1yx3EHiCKJdobRrCz+qtb1iOLlNtFlepPE/tkj dbv4o88PXVAaTvFL+XON9dNfdThUcLiRg+anpBrhDFwIvTAJT2/4ofZVA8hS/BZk+Tyq 1+aA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id t14-20020a056402524e00b0051e6316130dsi505830edd.5.2023.07.31.05.17.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Jul 2023 05:17:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 36VCHTOd015705 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 31 Jul 2023 14:17:32 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 08/11] Drop stm32mp15x-initramfs in favor of image enabling Date: Mon, 31 Jul 2023 14:17:26 +0200 Message-Id: <20230731121729.16972-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230731121729.16972-1-ubely@ilbers.de> References: <20230731121729.16972-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: ev4EU8jEQzcw From: Jan Kiszka To really test the hooks on the stm32mp15x, we need them as part of the initramfs generated for the image, not just stand-alone. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/stm32mp15x.conf | 2 ++ .../images/stm32mp15x-initramfs.bb | 15 --------------- testsuite/citest.py | 1 - 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 meta-isar/recipes-initramfs/images/stm32mp15x-initramfs.bb diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 4e8142ee..367b1934 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -23,4 +23,6 @@ IMAGE_INSTALL += "u-boot-script \ optee-examples-stm32mp15x-hotp-host \ optee-examples-stm32mp15x-random-host \ optee-examples-stm32mp15x-secure-storage-host \ + initramfs-tee-supplicant-hook \ + initramfs-tee-ftpm-hook \ " diff --git a/meta-isar/recipes-initramfs/images/stm32mp15x-initramfs.bb b/meta-isar/recipes-initramfs/images/stm32mp15x-initramfs.bb deleted file mode 100644 index 8ec6d7ce..00000000 --- a/meta-isar/recipes-initramfs/images/stm32mp15x-initramfs.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# Authors: -# Su Bao Cheng -# -# SPDX-License-Identifier: MIT -# - -inherit initramfs - -INITRAMFS_INSTALL += " \ - initramfs-tee-supplicant-hook \ - initramfs-tee-ftpm-hook \ - " diff --git a/testsuite/citest.py b/testsuite/citest.py index b81d86f9..f5cf1257 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -215,7 +215,6 @@ class NoCrossTest(CIBaseTest): 'mc:bananapi-bullseye:isar-image-base', 'mc:nanopi-neo-bullseye:isar-image-base', 'mc:stm32mp15x-bullseye:isar-image-base', - 'mc:stm32mp15x-bullseye:stm32mp15x-initramfs', 'mc:qemuamd64-focal:isar-image-ci' ] -- 2.20.1