From patchwork Mon Dec 13 16:26:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdellatif El Khlifi X-Patchwork-Id: 1110 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 67D4BC433EF for ; Mon, 13 Dec 2021 16:26:30 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.13491.1639412789660901049 for ; Mon, 13 Dec 2021 08:26:30 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: abdellatif.elkhlifi@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 04A6BD6E; Mon, 13 Dec 2021 08:26:24 -0800 (PST) Received: from e121910.arm.com (unknown [10.57.32.173]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E2C3F3F73B; Mon, 13 Dec 2021 08:26:22 -0800 (PST) From: abdellatif.elkhlifi@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Abdellatif El Khlifi Subject: [PATCH 1/6] arm/secure-partitions: remove the use of EXTRA_OEMAKE Date: Mon, 13 Dec 2021 16:26:05 +0000 Message-Id: <20211213162610.31273-2-abdellatif.elkhlifi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> References: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> 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 ; Mon, 13 Dec 2021 16:26:30 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2646 From: Abdellatif El Khlifi EXTRA_OEMAKE is not needed since we are using CMake. Change-Id: Ifc0dcc9313fe4e473cbba8eb3b716e11cf8e45ee Signed-off-by: Abdellatif El Khlifi --- .../recipes-security/trusted-services/secure-partitions.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/secure-partitions.inc b/meta-arm/recipes-security/trusted-services/secure-partitions.inc index f043fde..2f56502 100644 --- a/meta-arm/recipes-security/trusted-services/secure-partitions.inc +++ b/meta-arm/recipes-security/trusted-services/secure-partitions.inc @@ -19,7 +19,4 @@ LD[unexport] = "1" SECURITY_LDFLAGS = "" TARGET_LDFLAGS = "-Wl,--build-id=none -Wl,--hash-style=both" -EXTRA_OEMAKE += "HOST_PREFIX=${HOST_PREFIX}" -EXTRA_OEMAKE += "CROSS_COMPILE64=${HOST_PREFIX}" - do_configure[cleandirs] = "${B}" From patchwork Mon Dec 13 16:26:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdellatif El Khlifi X-Patchwork-Id: 1115 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 5D38EC433FE for ; Mon, 13 Dec 2021 16:26:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.13372.1639412792426812008 for ; Mon, 13 Dec 2021 08:26:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: abdellatif.elkhlifi@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 96539139F; Mon, 13 Dec 2021 08:26:25 -0800 (PST) Received: from e121910.arm.com (unknown [10.57.32.173]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5C9173F73B; Mon, 13 Dec 2021 08:26:24 -0800 (PST) From: abdellatif.elkhlifi@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Abdellatif El Khlifi , Emekcan Aras Subject: [PATCH 2/6] arm/psa-arch-tests: introduce the recipe Date: Mon, 13 Dec 2021 16:26:06 +0000 Message-Id: <20211213162610.31273-3-abdellatif.elkhlifi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> References: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> 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 ; Mon, 13 Dec 2021 16:26:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2649 From: Abdellatif El Khlifi This commit adds a recipe for psa-arch-tests linux userspace application. Included tests are; crypto, protected_storage, internal_trusted_storage and attestation. Change-Id: I6285aa2a6ae8fdd25f4327f1d301c59a88bce775 Signed-off-by: Emekcan Aras Signed-off-by: Abdellatif El Khlifi --- .../trusted-services/psa-arch-tests_git.bb | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb diff --git a/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb new file mode 100644 index 0000000..ff89b06 --- /dev/null +++ b/meta-arm/recipes-security/trusted-services/psa-arch-tests_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "PSA arch test application" + +require secure-partitions.inc + +LIC_FILES_CHKSUM += "file://../psa-arch-tests/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" +SRC_URI_PSA = "git://github.com/ARM-software/psa-arch-tests.git;protocol=https;branch=master;name=psa;destsuffix=git/psa-arch-tests" +SRC_URI:append = " ${SRC_URI_PSA}" + +SRCREV_FORMAT="ts_psa" +SRCREV_psa = "6e1549dde62d12c92fc2df90ebbbe2d2d77cc76a" +PV = "0.0+git${SRCREV_psa}" + +PSA_APPLICATION_NAME = "psa-api-test" +TS_ENVIRONMENT_LINUX = "arm-linux" + +PSA_API_TESTS += "deployments/psa-api-test/protected_storage/${TS_ENVIRONMENT_LINUX}" +PSA_API_TESTS += "deployments/psa-api-test/internal_trusted_storage/${TS_ENVIRONMENT_LINUX}" +PSA_API_TESTS += "deployments/psa-api-test/initial_attestation/${TS_ENVIRONMENT_LINUX}" +PSA_API_TESTS += "deployments/psa-api-test/crypto/${TS_ENVIRONMENT_LINUX}" + +EXTRA_OECMAKE += "-DCMAKE_POSITION_INDEPENDENT_CODE=True \ + -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_SYSTEM_PROCESSOR=arm \ + " + +do_deploy[noexec] = "1" From patchwork Mon Dec 13 16:26:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdellatif El Khlifi X-Patchwork-Id: 1111 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 6953CC4332F for ; Mon, 13 Dec 2021 16:26:30 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.13490.1639412788997565179 for ; Mon, 13 Dec 2021 08:26:29 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: abdellatif.elkhlifi@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 7ABFC143B; Mon, 13 Dec 2021 08:26:27 -0800 (PST) Received: from e121910.arm.com (unknown [10.57.32.173]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E9EAB3F73B; Mon, 13 Dec 2021 08:26:25 -0800 (PST) From: abdellatif.elkhlifi@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Emekcan Aras , Emekcan Aras , Abdellatif El Khlifi Subject: [PATCH 3/6] arm-bsp/psa-arch-tests: corstone1000: build the test applications Date: Mon, 13 Dec 2021 16:26:07 +0000 Message-Id: <20211213162610.31273-4-abdellatif.elkhlifi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> References: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> 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 ; Mon, 13 Dec 2021 16:26:30 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2644 From: Emekcan Aras This commit adds support for building/installing the test application. Also fixing CMake issues on the current trusted-service CMake source files. Change-Id: Iae0fc9bf9362cf5b7d65cd7b9f0445f62f3b83eb Signed-off-by: Emekcan Aras Signed-off-by: Abdellatif El Khlifi --- .../psa-arch-tests-corstone1000.inc | 43 ++++++++++++ ...arch-test-sysroot_compiler_flags_fix.patch | 68 +++++++++++++++++++ .../psa-arch-tests_%.bbappend | 6 ++ 3 files changed, 117 insertions(+) create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch create mode 100644 meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend diff --git a/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc new file mode 100644 index 0000000..f1aea12 --- /dev/null +++ b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests-corstone1000.inc @@ -0,0 +1,43 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/psa-arch-tests/corstone1000:" + +DEPENDS += "cmake-native" + +export CMAKE_BUILD_PARALLEL_LEVEL +CMAKE_BUILD_PARALLEL_LEVEL = "${@oe.utils.parallel_make(d, True)}" + +COMPATIBLE_MACHINE = "corstone1000" + +SRC_URI:append = "\ + file://0001-psa-arch-test-sysroot_compiler_flags_fix.patch \ + " + +FILES:${PN} += "${libdir}/libts.so* ${libdir}/deployments ${bindir}/psa-*" +FILES:${PN}-dev = "${includedir}/deployments/psa-api-test/" + +INSANE_SKIP:${PN} += "rpaths" + +do_configure() { + for PSA_API_TEST in ${PSA_API_TESTS}; do + cmake \ + -DSYSROOT_YOCTO=${RECIPE_SYSROOT} \ + -S ${S}/$PSA_API_TEST -B "${B}/$PSA_API_TEST" + done +} + +do_compile() { + for PSA_API_TEST in ${PSA_API_TESTS}; do + cmake --build "${B}/$PSA_API_TEST" + done +} + +do_install() { + for PSA_API_TEST in ${PSA_API_TESTS}; do + install -d -m 0755 ${D}${libdir}/${PSA_API_TEST} + install -d -m 0755 ${D}${includedir}/${PSA_API_TEST} + install -m 0755 ${B}/${PSA_API_TEST}/libts_install/arm-linux/lib/*.so* ${D}${libdir} + install -d -m 0755 ${B}/${PSA_API_TEST}/libts_install/arm-linux/include ${D}${includedir}/${PSA_API_TEST} + psafile_fullpath=`ls ${B}/${PSA_API_TEST}/psa-*` + psafile_filename="`basename -s .bin ${psafile_fullpath}`" + install -D -p -m 0755 ${psafile_fullpath} ${D}/${bindir}/${psafile_filename} + done +} \ No newline at end of file diff --git a/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch new file mode 100644 index 0000000..e9ce0c5 --- /dev/null +++ b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests/corstone1000/0001-psa-arch-test-sysroot_compiler_flags_fix.patch @@ -0,0 +1,68 @@ +Upstream-Status: Inappropriate [Not for upstreaming in the original repo] +Signed-off-by: Emekcan Aras + +From 340ef6788d2803543b15235bf16a79cbc02235bd Mon Sep 17 00:00:00 2001 +From: Emekcan Aras +Date: Mon, 6 Dec 2021 10:21:59 +0000 + +[PATCH] arm-bsp/psa-arch-test: Integrate psa-arch-test + +Signed-off-by: Emekcan Aras +--- + deployments/libts/libts-import.cmake | 4 +++- + external/MbedTLS/MbedTLS.cmake | 1 + + external/psa_arch_tests/psa_arch_tests.cmake | 1 + + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/deployments/libts/libts-import.cmake b/deployments/libts/libts-import.cmake +index 792ba86..e3793e8 100644 +--- a/deployments/libts/libts-import.cmake ++++ b/deployments/libts/libts-import.cmake +@@ -19,7 +19,6 @@ if(NOT DEFINED PROCESSOR_COUNT) + ProcessorCount(PROCESSOR_COUNT) + set(PROCESSOR_COUNT ${PROCESSOR_COUNT} CACHE STRING "Number of cores to use for parallel builds.") + endif() +- + set(LIBTS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/libts_install" CACHE PATH "libts installation directory") + set(LIBTS_PACKAGE_PATH "${LIBTS_INSTALL_PATH}/lib/cmake" CACHE PATH "libts CMake package directory") + set(LIBTS_SOURCE_DIR "${TS_ROOT}/deployments/libts/${TS_ENV}" CACHE PATH "libts source directory") +@@ -27,9 +26,12 @@ set(LIBTS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/libts-build" CACHE PATH + + file(MAKE_DIRECTORY ${LIBTS_BINARY_DIR}) + ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${SYSROOT_YOCTO}") ++ + #Configure the library + execute_process(COMMAND + ${CMAKE_COMMAND} ++ -DCMAKE_SYSROOT=${SYSROOT_YOCTO} + -DCMAKE_INSTALL_PREFIX=${LIBTS_INSTALL_PATH} + -GUnix\ Makefiles + ${LIBTS_SOURCE_DIR} +diff --git a/external/MbedTLS/MbedTLS.cmake b/external/MbedTLS/MbedTLS.cmake +index 3cbaed1..8c53f88 100644 +--- a/external/MbedTLS/MbedTLS.cmake ++++ b/external/MbedTLS/MbedTLS.cmake +@@ -59,6 +59,7 @@ set(PSA_CRYPTO_API_INCLUDE "${MBEDTLS_INSTALL_PATH}/include" CACHE STRING "PSA C + #Configure the library + execute_process(COMMAND + ${CMAKE_COMMAND} ++ -DCMAKE_SYSROOT=${SYSROOT_YOCTO} + -DENABLE_PROGRAMS=OFF + -DENABLE_TESTING=OFF + -DUNSAFE_BUILD=ON +diff --git a/external/psa_arch_tests/psa_arch_tests.cmake b/external/psa_arch_tests/psa_arch_tests.cmake +index e6ab73f..af00cfc 100644 +--- a/external/psa_arch_tests/psa_arch_tests.cmake ++++ b/external/psa_arch_tests/psa_arch_tests.cmake +@@ -52,6 +52,7 @@ string(REPLACE ";" " " PSA_ARCH_TEST_EXTERNAL_DEFS "${PSA_ARCH_TEST_EXTERNAL_DEF + # Configure the psa-arch-test library + execute_process(COMMAND + ${CMAKE_COMMAND} ++ -DCMAKE_SYSROOT=${SYSROOT_YOCTO} + -DTOOLCHAIN=INHERIT + -DCMAKE_TOOLCHAIN_FILE=${TS_EXTERNAL_LIB_TOOLCHAIN_FILE} + -DPSA_INCLUDE_PATHS=${PSA_ARCH_TESTS_EXTERNAL_INCLUDE_PATHS} +-- +2.25.1 + diff --git a/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend new file mode 100644 index 0000000..e517cd6 --- /dev/null +++ b/meta-arm-bsp/recipes-security/trusted-services/psa-arch-tests_%.bbappend @@ -0,0 +1,6 @@ +# Machine specific configurations + +MACHINE_PSA_REQUIRE ?= "" +MACHINE_PSA_REQUIRE:corstone1000 = "psa-arch-tests-corstone1000.inc" + +require ${MACHINE_PSA_REQUIRE} From patchwork Mon Dec 13 16:26:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdellatif El Khlifi X-Patchwork-Id: 1112 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 50E56C433F5 for ; Mon, 13 Dec 2021 16:26:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13262.1639412792428574706 for ; Mon, 13 Dec 2021 08:26:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: abdellatif.elkhlifi@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 221011474; Mon, 13 Dec 2021 08:26:29 -0800 (PST) Received: from e121910.arm.com (unknown [10.57.32.173]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DAE1E3F73B; Mon, 13 Dec 2021 08:26:27 -0800 (PST) From: abdellatif.elkhlifi@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Abdellatif El Khlifi Subject: [PATCH 4/6] kas: corstone1000: update meta-arm-image SHA Date: Mon, 13 Dec 2021 16:26:08 +0000 Message-Id: <20211213162610.31273-5-abdellatif.elkhlifi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> References: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> 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 ; Mon, 13 Dec 2021 16:26:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2650 From: Abdellatif El Khlifi Aligning to the last meta-arm-image version to add psa-arch-tests to the rootfs. Change-Id: I40e945f814df4b6f7c30772d3dd6f91e6b6fcafc Signed-off-by: Abdellatif El Khlifi --- kas/corstone1000-base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas/corstone1000-base.yml b/kas/corstone1000-base.yml index ce3d230..31a92c4 100644 --- a/kas/corstone1000-base.yml +++ b/kas/corstone1000-base.yml @@ -31,7 +31,7 @@ repos: meta-arm-image: url: https://git.gitlab.arm.com/arm-reference-solutions/meta-arm-image.git - refspec: 4512b434d5cde8881473c4caa724a26cd517a604 + refspec: aeb0571e8bc935f3f8b15c3b27ab4275e2069b5b local_conf_header: base: | From patchwork Mon Dec 13 16:26:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdellatif El Khlifi X-Patchwork-Id: 1113 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 7F975C4321E for ; Mon, 13 Dec 2021 16:26:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13344.1639412792426074639 for ; Mon, 13 Dec 2021 08:26:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: abdellatif.elkhlifi@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 AAD5B1FB; Mon, 13 Dec 2021 08:26:30 -0800 (PST) Received: from e121910.arm.com (unknown [10.57.32.173]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8276B3F73B; Mon, 13 Dec 2021 08:26:29 -0800 (PST) From: abdellatif.elkhlifi@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Abdellatif El Khlifi , Ross Burton Subject: [PATCH 5/6] kas: corstone1000: update for new Kas include semantics in kas folder Date: Mon, 13 Dec 2021 16:26:09 +0000 Message-Id: <20211213162610.31273-6-abdellatif.elkhlifi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> References: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> 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 ; Mon, 13 Dec 2021 16:26:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2647 From: Abdellatif El Khlifi With Kas 2.6 included YAML files need to be relative to the repository, not the including file: https://kas.readthedocs.io/en/latest/format-changelog.html#version-11 Change-Id: I851c9137d1f70f754d1a70a1fc14828c39ff3de7 Signed-off-by: Ross Burton Signed-off-by: Abdellatif El Khlifi --- kas/corstone1000-base.yml | 2 +- kas/corstone1000-fvp.yml | 4 ++-- kas/corstone1000-mps3.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kas/corstone1000-base.yml b/kas/corstone1000-base.yml index 31a92c4..faf2599 100644 --- a/kas/corstone1000-base.yml +++ b/kas/corstone1000-base.yml @@ -1,5 +1,5 @@ header: - version: 9 + version: 11 distro: poky-tiny diff --git a/kas/corstone1000-fvp.yml b/kas/corstone1000-fvp.yml index 0f6cde2..133749d 100644 --- a/kas/corstone1000-fvp.yml +++ b/kas/corstone1000-fvp.yml @@ -1,7 +1,7 @@ header: - version: 9 + version: 11 includes: - - corstone1000-base.yml + - kas/corstone1000-base.yml repos: run-scripts: diff --git a/kas/corstone1000-mps3.yml b/kas/corstone1000-mps3.yml index 06e5962..53be438 100644 --- a/kas/corstone1000-mps3.yml +++ b/kas/corstone1000-mps3.yml @@ -1,6 +1,6 @@ header: - version: 9 + version: 11 includes: - - corstone1000-base.yml + - kas/corstone1000-base.yml machine: corstone1000-mps3 From patchwork Mon Dec 13 16:26:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdellatif El Khlifi X-Patchwork-Id: 1114 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 7F9A0C4167B for ; Mon, 13 Dec 2021 16:26:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13261.1639412792215631136 for ; Mon, 13 Dec 2021 08:26:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: abdellatif.elkhlifi@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 DCC7AD6E; Mon, 13 Dec 2021 08:26:31 -0800 (PST) Received: from e121910.arm.com (unknown [10.57.32.173]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E74793F73B; Mon, 13 Dec 2021 08:26:30 -0800 (PST) From: abdellatif.elkhlifi@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Abdellatif El Khlifi Subject: [PATCH 6/6] arm-bsp/trusted-firmware-m: corstone1000: set SRCREV_FORMAT Date: Mon, 13 Dec 2021 16:26:10 +0000 Message-Id: <20211213162610.31273-7-abdellatif.elkhlifi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> References: <20211213162610.31273-1-abdellatif.elkhlifi@arm.com> 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 ; Mon, 13 Dec 2021 16:26:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2648 From: Abdellatif El Khlifi Adding to SRCREV_FORMAT the names of the repos fetched. Change-Id: Idf80065c39b2124bf384d0dbb4028138b27c1e10 Signed-off-by: Abdellatif El Khlifi --- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index a060358..c418877 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -13,6 +13,7 @@ SRCREV_tfm = "dc605e057470bb0eb0e92c2aafb443300a90c43f" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8" PV = "1.5+git${SRCREV_tfm}" +SRCREV_FORMAT = "tfm_mcuboot_tfm-tests_mbedtls" # The install task signs the TF-A BL2 and FIP binaries. # So they need to be copied to the sysroot. Hence the dependencies below: