From patchwork Fri Sep 29 15:21:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31377 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 48B71E71D54 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20398.1696000892479104868 for ; Fri, 29 Sep 2023 08:21:32 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7EF401FB; Fri, 29 Sep 2023 08:22:10 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A93153F5A1; Fri, 29 Sep 2023 08:21:31 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 01/10] arm/apply_local_src_patches: allow use in multiple directories Date: Fri, 29 Sep 2023 16:21:19 +0100 Message-Id: <20230929152128.3401009-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5081 From: Ross Burton Pull out the patch application logic so the postfunc by default scans for patches in LOCAL_SRC_PATCHES_INPUT_DIR and applies them to LOCAL_SRC_PATCHES_DEST_DIR as before. This allows recipes to inherit the class and directly call apply_local_src_patches as needed to process patches in multiple directories. Signed-off-by: Ross Burton --- meta-arm/classes/apply_local_src_patches.bbclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-arm/classes/apply_local_src_patches.bbclass b/meta-arm/classes/apply_local_src_patches.bbclass index e1939353..0897b51b 100644 --- a/meta-arm/classes/apply_local_src_patches.bbclass +++ b/meta-arm/classes/apply_local_src_patches.bbclass @@ -17,8 +17,8 @@ python() { apply_local_src_patches() { - input_dir="${LOCAL_SRC_PATCHES_INPUT_DIR}" - dest_dir="${LOCAL_SRC_PATCHES_DEST_DIR}" + input_dir="$1" + dest_dir="$2" if [ ! -d "$input_dir" ] ; then bbfatal "LOCAL_SRC_PATCHES_INPUT_DIR=$input_dir not found." @@ -32,6 +32,7 @@ apply_local_src_patches() { export QUILT_PATCHES=./patches-extra mkdir -p patches-extra + bbdebug 1 "Looking for patches in $input_dir" for patch in $(find $input_dir -type f -name *.patch -or -name *.diff | sort) do patch_basename=`basename $patch` @@ -45,4 +46,8 @@ apply_local_src_patches() { fi done } -do_patch[postfuncs] += "apply_local_src_patches" + +do_apply_local_src_patches() { + apply_local_src_patches "${LOCAL_SRC_PATCHES_INPUT_DIR}" "${LOCAL_SRC_PATCHES_DEST_DIR}" +} +do_patch[postfuncs] += "do_apply_local_src_patches" From patchwork Fri Sep 29 15:21:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31376 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 47CB4E71D53 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20399.1696000893146471981 for ; Fri, 29 Sep 2023 08:21:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2A286DA7; Fri, 29 Sep 2023 08:22:11 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 559223F5A1; Fri, 29 Sep 2023 08:21:32 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 02/10] arm/trusted-services: pass through CMake generator Date: Fri, 29 Sep 2023 16:21:20 +0100 Message-Id: <20230929152128.3401009-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5082 From: Ross Burton Pass through the choice of CMake Generator when starting sub-cmakes for the external components, so that they use Ninja instead of Make. Signed-off-by: Ross Burton --- ...ch-allow-setting-the-cmake-generator.patch | 46 +++++++++++++++++++ .../trusted-services/trusted-services-src.inc | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta-arm/recipes-security/trusted-services/files/0001-LazyFetch-allow-setting-the-cmake-generator.patch diff --git a/meta-arm/recipes-security/trusted-services/files/0001-LazyFetch-allow-setting-the-cmake-generator.patch b/meta-arm/recipes-security/trusted-services/files/0001-LazyFetch-allow-setting-the-cmake-generator.patch new file mode 100644 index 00000000..6664fd05 --- /dev/null +++ b/meta-arm/recipes-security/trusted-services/files/0001-LazyFetch-allow-setting-the-cmake-generator.patch @@ -0,0 +1,46 @@ +From e62709f8e6f586ace7975b58b8a1c726d120759f Mon Sep 17 00:00:00 2001 +From: Gyorgy Szing +Date: Thu, 31 Aug 2023 18:24:50 +0200 +Subject: [PATCH] LazyFetch: allow setting the cmake generator + +Allow configuring the CMake generator used for external components. By +default use the generator the main project is using. +For details see the documentation in tools/cmake/common/LazyFetch.cmake. + +Change-Id: Ie01ea1ae533cf7a40c1f09808de2ad2e83a09db3 +Signed-off-by: Gyorgy Szing + +Upstream-Status: Backport +Signed-off-by: Ross Burton +--- + tools/cmake/common/LazyFetch.cmake | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/tools/cmake/common/LazyFetch.cmake b/tools/cmake/common/LazyFetch.cmake +index 68e790e..7676201 100644 +--- a/tools/cmake/common/LazyFetch.cmake ++++ b/tools/cmake/common/LazyFetch.cmake +@@ -87,11 +87,20 @@ function(LazyFetch_ConfigAndBuild) + "component specific. Pleas refer to the upstream documentation for more information.") + endif() + ++ if(NOT DEFINED ${UC_DEP_NAME}_GENERATOR) ++ if(DEFINED ENV{${UC_DEP_NAME}_GENERATOR}) ++ set(${UC_DEP_NAME}_GENERATOR ENV{${UC_DEP_NAME}_GENERATOR} CACHE STRING "CMake generator used for ${UC_DEP_NAME}.") ++ else() ++ set(${UC_DEP_NAME}_GENERATOR ${CMAKE_GENERATOR} CACHE STRING "CMake generator used for ${UC_DEP_NAME}.") ++ endif() ++ endif() ++ + execute_process(COMMAND + ${CMAKE_COMMAND} -E env "CROSS_COMPILE=${CROSS_COMPILE}" + ${CMAKE_COMMAND} + "-C${CONFIGURED_CACHE_FILE}" + -DCMAKE_BUILD_TYPE=${${UC_DEP_NAME}_BUILD_TYPE} ++ -G${${UC_DEP_NAME}_GENERATOR} + -S ${BUILD_SRC_DIR} + -B ${BUILD_BIN_DIR} + RESULT_VARIABLE +-- +2.34.1 + diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc index 86eb5083..50360b1d 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -9,6 +9,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI:append = "\ file://0001-Limit-nanopb-build-to-single-process.patch \ + file://0001-LazyFetch-allow-setting-the-cmake-generator.patch \ " #Latest on 2023 April 28 From patchwork Fri Sep 29 15:21:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31380 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 458DDE71D4F for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20400.1696000893850020384 for ; Fri, 29 Sep 2023 08:21:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D36B11007; Fri, 29 Sep 2023 08:22:11 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 018D03F5A1; Fri, 29 Sep 2023 08:21:32 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 03/10] arm/trusted-services: add missing pkgconfig inherit Date: Fri, 29 Sep 2023 16:21:21 +0100 Message-Id: <20230929152128.3401009-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5083 From: Ross Burton The configure log warns that it couldn't find pkgconfig, so add this so it can. Signed-off-by: Ross Burton --- meta-arm/recipes-security/trusted-services/trusted-services.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/trusted-services/trusted-services.inc b/meta-arm/recipes-security/trusted-services/trusted-services.inc index c64a1d41..b46cd498 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://trusted-services.readthedocs.io/en/latest/index.html" LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib" -inherit python3native cmake +inherit python3native cmake pkgconfig COMPATIBLE_HOST = "aarch64.*-linux" COMPATIBLE_MACHINE ?= "invalid" From patchwork Fri Sep 29 15:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31378 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 57320E71D56 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20402.1696000894534549758 for ; Fri, 29 Sep 2023 08:21:34 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 883461FB; Fri, 29 Sep 2023 08:22:12 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AAED93F5A1; Fri, 29 Sep 2023 08:21:33 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 04/10] arm/trusted-services/ts-remote-test: move binary to $bindir Date: Fri, 29 Sep 2023 16:21:22 +0100 Message-Id: <20230929152128.3401009-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5084 From: Ross Burton As with ts-service-test, manually move the binary to $bindir. Signed-off-by: Ross Burton --- .../trusted-services/ts-remote-test_git.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta-arm/recipes-security/trusted-services/ts-remote-test_git.bb b/meta-arm/recipes-security/trusted-services/ts-remote-test_git.bb index 203defea..1633ecfe 100644 --- a/meta-arm/recipes-security/trusted-services/ts-remote-test_git.bb +++ b/meta-arm/recipes-security/trusted-services/ts-remote-test_git.bb @@ -10,3 +10,10 @@ RDEPENDS:${PN} += "libts" OECMAKE_SOURCEPATH = "${S}/deployments/ts-remote-test/${TS_ENV}" FILES:${PN} = "${bindir}/ts-remote-test" + +do_install:append () { + install -d ${D}${bindir} + mv ${D}${TS_INSTALL}/bin/ts-remote-test ${D}${bindir} + + rm -r --one-file-system ${D}${TS_INSTALL} +} From patchwork Fri Sep 29 15:21:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31379 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 5EC71E71D55 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20403.1696000895123069955 for ; Fri, 29 Sep 2023 08:21:35 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3CF73DA7; Fri, 29 Sep 2023 08:22:13 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5FBAA3F5A1; Fri, 29 Sep 2023 08:21:34 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 05/10] arm/trusted-services/ts-sp-env-test: add missing DEPENDS Date: Fri, 29 Sep 2023 16:21:23 +0100 Message-Id: <20230929152128.3401009-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5085 From: Ross Burton This recipe won't pass configure without the jsonschema and jinja2 Python modules. Signed-off-by: Ross Burton --- .../recipes-security/trusted-services/ts-sp-env-test_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb b/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb index 5551a4de..cda43e6e 100644 --- a/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb +++ b/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb @@ -8,4 +8,6 @@ COMPATIBLE_MACHINE ?= "invalid" SP_UUID = "${ENV_TEST_UUID}" TS_SP_ENVTEST_CONFIG ?= "baremetal-fvp_base_revc" +DEPENDS += "python3-jsonschema-native python3-jinja2-native" + OECMAKE_SOURCEPATH="${S}/deployments/env-test/config/${TS_SP_ENVTEST_CONFIG}-${TS_ENV}" From patchwork Fri Sep 29 15:21:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31381 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 666D0E71D58 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.20418.1696000895944137038 for ; Fri, 29 Sep 2023 08:21:36 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E5F8E1FB; Fri, 29 Sep 2023 08:22:13 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 149013F5A1; Fri, 29 Sep 2023 08:21:34 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 06/10] arm/trusted-services/ts-sp-env-test: remove Date: Fri, 29 Sep 2023 16:21:24 +0100 Message-Id: <20230929152128.3401009-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5086 From: Ross Burton This test needs the TF-A sources available to build. When the test is needed, this commit can be reverted to bring it back. Signed-off-by: Ross Burton --- .../trusted-services/ts-sp-env-test_git.bb | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb diff --git a/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb b/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb deleted file mode 100644 index cda43e6e..00000000 --- a/meta-arm/recipes-security/trusted-services/ts-sp-env-test_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Trusted Services test_runner service provider" - -require ts-sp-common.inc - -# Current version of env-test SP contains hard-coded values for FVP. -COMPATIBLE_MACHINE ?= "invalid" - -SP_UUID = "${ENV_TEST_UUID}" -TS_SP_ENVTEST_CONFIG ?= "baremetal-fvp_base_revc" - -DEPENDS += "python3-jsonschema-native python3-jinja2-native" - -OECMAKE_SOURCEPATH="${S}/deployments/env-test/config/${TS_SP_ENVTEST_CONFIG}-${TS_ENV}" From patchwork Fri Sep 29 15:21:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31382 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 6CDC2E71D5C for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.20419.1696000896544628475 for ; Fri, 29 Sep 2023 08:21:36 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 91EBCDA7; Fri, 29 Sep 2023 08:22:14 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BD9F23F5A1; Fri, 29 Sep 2023 08:21:35 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 07/10] arm/trusted-services: use apply_local_src_patches Date: Fri, 29 Sep 2023 16:21:25 +0100 Message-Id: <20230929152128.3401009-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5087 From: Ross Burton Now that the apply_local_src_patches class supports being used with multiple directories, use that instead of reimplementing the logic. Also remove redundant patchdir assignments as these patches are against the trusted-services repository, which is ${S}. I suspect these are exposing a subtle bug in the core patching logic which meant the local patches were not applying correctly. Signed-off-by: Ross Burton --- .../trusted-services/ts-arm-platforms.inc | 16 ++++++++-------- .../trusted-services/trusted-services-src.inc | 19 ++++++++++--------- .../ts-psa-api-test-common_git.inc | 10 +++------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc index 29e33ffe..551a67dc 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc @@ -2,14 +2,14 @@ FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000:" COMPATIBLE_MACHINE:corstone1000 = "corstone1000" SRC_URI:append:corstone1000 = " \ - file://0001-Add-stub-capsule-update-service-components.patch;patchdir=../trusted-services \ - file://0002-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch;patchdir=../trusted-services \ - file://0003-FMP-Support-in-Corstone1000.patch;patchdir=../trusted-services \ - file://0004-GetNextVariableName-Fix.patch;patchdir=../trusted-services \ - file://0005-plat-corstone1000-add-compile-definitions-for-ECP_DP.patch;patchdir=../trusted-services \ - file://0006-plat-corstone1000-Use-the-stateless-platform-service.patch;patchdir=../trusted-services \ - file://0007-plat-corstone1000-Initialize-capsule-update-provider.patch;patchdir=../trusted-services \ - file://0008-plat-corstone1000-change-ns-interrupt-action.patch;patchdir=../trusted-services \ + file://0001-Add-stub-capsule-update-service-components.patch \ + file://0002-Fixes-in-AEAD-for-psa-arch-test-54-and-58.patch \ + file://0003-FMP-Support-in-Corstone1000.patch \ + file://0004-GetNextVariableName-Fix.patch \ + file://0005-plat-corstone1000-add-compile-definitions-for-ECP_DP.patch \ + file://0006-plat-corstone1000-Use-the-stateless-platform-service.patch \ + file://0007-plat-corstone1000-Initialize-capsule-update-provider.patch \ + file://0008-plat-corstone1000-change-ns-interrupt-action.patch \ " diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc index 50360b1d..ce073943 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -61,16 +61,17 @@ LIC_FILES_CHKSUM += "file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e14135 SRCREV_FORMAT = "trusted-services_dtc_mbedtls_nanopb_qcbor_tcose_cpputest_libmetal_openamp" -# TS ships patches for external dependencies that needs to be applied -apply_ts_patches() { - ( cd ${WORKDIR}/git/qcbor; git stash; git branch -f bf_am; git am ${S}/external/qcbor/*.patch; git reset bf_am ) - ( cd ${WORKDIR}/git/tcose; git stash; git branch -f bf_am; git am ${S}/external/t_cose/*.patch; git reset bf_am ) - ( cd ${WORKDIR}/git/mbedtls; git stash; git branch -f bf_am; git am ${S}/external/MbedTLS/*.patch; git reset bf_am ) - ( cd ${WORKDIR}/git/cpputest; git stash; git apply ${S}/external/CppUTest/*.patch ) - ( cd ${WORKDIR}/git/dtc; git stash; git apply ${S}/external/libfdt/*.patch ) - ( cd ${WORKDIR}/git/nanopb; git stash; git apply ${S}/external/nanopb/*.patch ) +inherit apply_local_src_patches +LOCAL_SRC_PATCHES_INPUT_DIR = "N/A" + +do_apply_local_src_patches() { + apply_local_src_patches ${S}/external/qcbor ${WORKDIR}/git/qcbor + apply_local_src_patches ${S}/external/t_cose ${WORKDIR}/git/tcose + apply_local_src_patches ${S}/external/MbedTLS ${WORKDIR}/git/mbedtls + apply_local_src_patches ${S}/external/CppUTest ${WORKDIR}/git/cpputest + apply_local_src_patches ${S}/external/libfdt ${WORKDIR}/git/dtc + apply_local_src_patches ${S}/external/nanopb ${WORKDIR}/git/nanopb } -do_patch[postfuncs] += "apply_ts_patches" # Paths to dependencies required by some TS SPs/tools EXTRA_OECMAKE += "-DDTC_SOURCE_DIR=${WORKDIR}/git/dtc \ diff --git a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc index 8a7b0e5c..c8b4e992 100644 --- a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc +++ b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc @@ -16,15 +16,11 @@ SRC_URI += "git://github.com/ARM-software/psa-arch-tests.git;name=psatest;protoc SRCREV_psatest = "38cb53a4d9e292435ddf7899960b15af62decfbe" LIC_FILES_CHKSUM += "file://../psatest/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" -EXTRA_OECMAKE += "\ - -DPSA_ARCH_TESTS_SOURCE_DIR=${WORKDIR}/git/psatest \ - " +EXTRA_OECMAKE += "-DPSA_ARCH_TESTS_SOURCE_DIR=${WORKDIR}/git/psatest" -# TS check if there are patches to apply to psa-arch-tests, if so apply them -apply_ts_patch() { - find ${S}/external/psa_arch_tests -type f -name '*.patch' -exec patch -p1 -d ${WORKDIR}/git/psatest -i {} \; +do_apply_local_src_patches:append() { + apply_local_src_patches ${S}/external/psa_arch_tests ${WORKDIR}/git/psatest } -do_patch[postfuncs] += "apply_ts_patch" FILES:${PN} = "${bindir}/${PSA_TEST}" From patchwork Fri Sep 29 15:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31384 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 759A0E71D5E for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.20421.1696000897134035919 for ; Fri, 29 Sep 2023 08:21:37 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3E0DD1FB; Fri, 29 Sep 2023 08:22:15 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 69AC93F5A1; Fri, 29 Sep 2023 08:21:36 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 08/10] arm/trusted-services: upgrade nanopb and fix build races Date: Fri, 29 Sep 2023 16:21:26 +0100 Message-Id: <20230929152128.3401009-8-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5088 From: Ross Burton Upgrade nanopb, clean up how it is build, and hopefully fix the build races. This patch isn't quite ready to be upstreamed but discussion with the TS maintainer is ongoing. Signed-off-by: Ross Burton --- .../files/nanopb-upgrade.patch | 112 ++++++++++++++++++ .../trusted-services/trusted-services-src.inc | 5 +- 2 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 meta-arm/recipes-security/trusted-services/files/nanopb-upgrade.patch diff --git a/meta-arm/recipes-security/trusted-services/files/nanopb-upgrade.patch b/meta-arm/recipes-security/trusted-services/files/nanopb-upgrade.patch new file mode 100644 index 00000000..3e21f553 --- /dev/null +++ b/meta-arm/recipes-security/trusted-services/files/nanopb-upgrade.patch @@ -0,0 +1,112 @@ +Upgrade the nanopb checkout to 0.4.7 plus some important build fixes, and +change the build/install process to be more reliable. + +This should be upstreamed, but some pieces of this are not upstreamable in their +current state. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/external/nanopb/fix-pyhon-name.patch b/external/nanopb/fix-pyhon-name.patch +deleted file mode 100644 +index ab0e84c..0000000 +--- a/external/nanopb/fix-pyhon-name.patch ++++ /dev/null +@@ -1,41 +0,0 @@ +-This patch fixes two issues: +- +-1. On windows the python3 executable is not allways called "python3". As a result +- "protoc" execution can fail due to the shebang in the file. This patch fixes +- this by running protoc with the intepreter. +- +-2. In addition when not running from a virtualenv, the install path for python file +- is set to the "user site-packages" to avoid needing elevated access rights. +- +-diff --git a/CMakeLists.txt b/CMakeLists.txt +-index 31c86e7..e827015 100644 +---- a/CMakeLists.txt +-+++ b/CMakeLists.txt +-@@ -54,13 +54,25 @@ if(nanopb_BUILD_GENERATOR) +- string(REGEX REPLACE "([^;]+)" "\\1_pb2.py" generator_proto_py_file "${generator_proto}") +- add_custom_command( +- OUTPUT ${generator_proto_py_file} +-- COMMAND ${nanopb_PROTOC_PATH} --python_out=${PROJECT_BINARY_DIR} -I${PROJECT_SOURCE_DIR}/generator/proto ${generator_proto_file} +-+ COMMAND ${Python_EXECUTABLE} ${nanopb_PROTOC_PATH} --python_out=${PROJECT_BINARY_DIR} -I${PROJECT_SOURCE_DIR}/generator/proto ${generator_proto_file} +- DEPENDS ${generator_proto_file} +- ) +- add_custom_target("generate_${generator_proto_py_file}" ALL DEPENDS ${generator_proto_py_file}) +-+ +-+ if (DEFINED ENV{VIRTUAL_ENV}) +-+ set(PYTHON_INSTALL_DIR ${Python_SITELIB} CACHE PATH "Install location for generated python modules.") +-+ else() +-+ execute_process( +-+ COMMAND ${Python_EXECUTABLE} -m site --user-site +-+ OUTPUT_VARIABLE PYTHON_USER_SITE +-+ OUTPUT_STRIP_TRAILING_WHITESPACE +-+ ) +-+ set(PYTHON_INSTALL_DIR ${PYTHON_USER_SITE} CACHE PATH "Install location for generated python modules.") +-+ endif() +-+ +- install( +- FILES ${PROJECT_BINARY_DIR}/${generator_proto_py_file} +-- DESTINATION ${Python_SITELIB} +-+ DESTINATION ${PYTHON_INSTALL_DIR} +- ) +- endforeach() +- endif() +diff --git a/external/nanopb/nanopb-init-cache.cmake.in b/external/nanopb/nanopb-init-cache.cmake.in +index fb8104d..8df41dd 100644 +--- a/external/nanopb/nanopb-init-cache.cmake.in ++++ b/external/nanopb/nanopb-init-cache.cmake.in +@@ -12,11 +12,15 @@ set(BUILD_STATIC_LIBS On CACHE BOOL "") + set(nanopb_BUILD_RUNTIME On CACHE BOOL "") + set(nanopb_BUILD_GENERATOR On CACHE BOOL "") + set(nanopb_MSVC_STATIC_RUNTIME Off BOOL "") +-set(nanopb_PROTOC_PATH ${CMAKE_SOURCE_DIR}/generator/protoc CACHE STRING "") ++ ++set(Python_EXECUTABLE "@Python_EXECUTABLE@" CACHE PATH "Location of python3 executable") + + string(TOUPPER @CMAKE_CROSSCOMPILING@ CMAKE_CROSSCOMPILING) # CMake expects TRUE + if (CMAKE_CROSSCOMPILING) + set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY CACHE STRING "") + endif() + ++set(nanopb_PYTHON_INSTDIR_OVERRIDE "@BUILD_INSTALL_DIR@/lib/python" CACHE PATH "") ++set(NANOPB_GENERATOR_DIR "@BUILD_INSTALL_DIR@/lib/python" CACHE PATH "") ++ + @_cmake_fragment@ +diff --git a/external/nanopb/nanopb.cmake b/external/nanopb/nanopb.cmake +index 36465f6..57cf3d6 100644 +--- a/external/nanopb/nanopb.cmake ++++ b/external/nanopb/nanopb.cmake +@@ -28,7 +28,7 @@ running this module. + + set(NANOPB_URL "https://github.com/nanopb/nanopb.git" + CACHE STRING "nanopb repository URL") +-set(NANOPB_REFSPEC "nanopb-0.4.2" ++set(NANOPB_REFSPEC "nanopb-0.4.7" + CACHE STRING "nanopb git refspec") + set(NANOPB_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/nanopb-src" + CACHE PATH "nanopb source-code") +@@ -85,7 +85,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter) + + find_file(NANOPB_GENERATOR_PATH + NAMES nanopb_generator.py +- PATHS ${nanopb_SOURCE_DIR}/generator ++ PATHS ${NANOPB_INSTALL_DIR}/bin + DOC "nanopb protobuf compiler" + NO_DEFAULT_PATH + ) +@@ -186,11 +186,10 @@ function(protobuf_generate) + target_include_directories(${PARAMS_TGT} PRIVATE ${_OUT_DIR_BASE}) + endif() + +- get_filename_component(NANOPB_GENERATOR_DIR "${NANOPB_GENERATOR_PATH}" DIRECTORY CACHE "Location of nanopb generator.") + #Append a protobuf generator command to the nanopb_generate target. + add_custom_command(OUTPUT "${_OUT_C}" "${_OUT_H}" + COMMAND +- ${CMAKE_COMMAND} -E env PYTHONPATH=${NANOPB_GENERATOR_DIR} ++ ${CMAKE_COMMAND} -E env PYTHONPATH=${NANOPB_INSTALL_DIR}/lib/python + ${Python3_EXECUTABLE} ${NANOPB_GENERATOR_PATH} + -I ${PARAMS_BASE_DIR} + -D ${_OUT_DIR_BASE} diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc index ce073943..20a46219 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -10,6 +10,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI:append = "\ file://0001-Limit-nanopb-build-to-single-process.patch \ file://0001-LazyFetch-allow-setting-the-cmake-generator.patch \ + file://nanopb-upgrade.patch \ " #Latest on 2023 April 28 @@ -29,9 +30,9 @@ SRC_URI += "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;bra SRCREV_mbedtls = "8c89224991adff88d53cd380f42a2baa36f91454" LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -# Nanopb, tag "nanopb-0.4.2" +# Nanopb, tag "nanopb-0.4.7" plus some further fixes SRC_URI += "git://github.com/nanopb/nanopb.git;name=nanopb;protocol=https;branch=master;destsuffix=git/nanopb" -SRCREV_nanopb = "df0e92f474f9cca704fe2b31483f0b4d1b1715a4" +SRCREV_nanopb = "dbbf5d8992295aae669b8071eadad02f87d5faf0" LIC_FILES_CHKSUM += "file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" # qcbor, tag "v1.0.0" From patchwork Fri Sep 29 15:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31383 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 7F09AE7F154 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.20405.1696000897953788151 for ; Fri, 29 Sep 2023 08:21:38 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E6EC31007; Fri, 29 Sep 2023 08:22:15 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1576A3F5A1; Fri, 29 Sep 2023 08:21:36 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 09/10] CI: use a venv for sphinx Date: Fri, 29 Sep 2023 16:21:27 +0100 Message-Id: <20230929152128.3401009-9-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5089 From: Ross Burton The Kas container in version 4 onwards is based on Debian 12, which forbids pip from installing files into /usr or ~/.local/. We want to install the arbitrary dependencies for the documentation build, so these should be installed in a venv. The kas container doesn't currently install python3-venv, so we have to install that manually (patch sent upstream). Signed-off-by: Ross Burton --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c750698d..7e1a77cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -288,7 +288,14 @@ documentation: extends: .setup script: - | - sudo pip3 install -r meta-arm-bsp/documentation/requirements.txt + # This can be removed when the kas container has python3-venv installed + sudo apt-get update && sudo apt-get install --yes python3-venv + + python3 -m venv venv + . ./venv/bin/activate + + pip3 install -r meta-arm-bsp/documentation/requirements.txt + for CONF in meta-*/documentation/*/conf.py ; do echo Building $CONF... SOURCE_DIR=$(dirname $CONF) From patchwork Fri Sep 29 15:21:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 31385 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 7F8D4E81810 for ; Fri, 29 Sep 2023 15:21:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.20422.1696000898564615927 for ; Fri, 29 Sep 2023 08:21:38 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9BC591FB; Fri, 29 Sep 2023 08:22:16 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BE5E83F5A1; Fri, 29 Sep 2023 08:21:37 -0700 (PDT) From: ross.burton@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 10/10] CI: upgrade to Kas 4 container Date: Fri, 29 Sep 2023 16:21:28 +0100 Message-Id: <20230929152128.3401009-10-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929152128.3401009-1-ross.burton@arm.com> References: <20230929152128.3401009-1-ross.burton@arm.com> MIME-Version: 1.0 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, 29 Sep 2023 15:21:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5090 From: Ross Burton The Kas binary is identical, but the container has been rebuilt using Debian 12 (Bookworm). Signed-off-by: Ross Burton --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e1a77cd..806d4b4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ${MIRROR_GHCR}/siemens/kas/kas:3.3 +image: ${MIRROR_GHCR}/siemens/kas/kas:4.0 variables: CPU_REQUEST: ""