From patchwork Wed Jun 17 12:23:29 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cassegrain X-Patchwork-Id: 90378 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 4EC37CD98E4 for ; Wed, 17 Jun 2026 12:24:43 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.14157.1781699073584213947 for ; Wed, 17 Jun 2026 05:24:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=BhbMzBTA; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: arthur.cassegrain@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 2C8674794; Wed, 17 Jun 2026 05:24:28 -0700 (PDT) Received: from e142502.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 EFF053F905; Wed, 17 Jun 2026 05:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781699072; bh=C+POxn33MRIDIY0rPGe/vIpgN+jp2XHm3x7tzydC+hY=; h=From:To:Cc:Subject:Date:From; b=BhbMzBTAVE2/EnYGk3jL09DqLHkhhT2+W+9PsNF0VY1CJ1xT1tf7sVOrgggtAtaov V2ZHQRWrbcUy2NunYBHmKpOMuOaja/j6QE6IO3PW3grooYNBq+YSi4H6pP+RiR9zY5 1VVckzOQBfQ6pspzm78bfWE0qL6AT9C+y3DQbyx0= From: arthur.cassegrain@arm.com To: meta-arm@lists.yoctoproject.org Cc: Arthur Cassegrain Subject: [PATCH] arm/trusted-services: enable devtool modify for ts-psa-api-test Date: Wed, 17 Jun 2026 14:23:29 +0200 Message-ID: <20260617122329.2485831-1-arthur.cassegrain@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 Jun 2026 12:24:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7080 From: Arthur Cassegrain Place psa-arch-tests under ${S}/ts-external/psatest and update the recipe paths to match. This keeps the external source layout aligned with trusted-services, updates the Corstone-1000 patch locations, and lets devtool modify work against the same psa-arch-tests tree that CMake and apply_local_src_patches use. Signed-off-by: Arthur Cassegrain --- .../trusted-services/ts-psa-api-test.inc | 8 ++++---- .../trusted-services/ts-psa-api-test-common_git.inc | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc index 006bcdef..70bd8621 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc @@ -3,8 +3,8 @@ FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000/psa-apitest:" include ts-arm-platforms.inc SRC_URI:append:corstone1000 = " \ - file://0001-corstone1000-port-crypto-config.patch;patchdir=../psatest \ - file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=../psatest \ - file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=../psatest \ - file://0004-Remove-RSA-support.patch;patchdir=../psatest \ + file://0001-corstone1000-port-crypto-config.patch;patchdir=../ts/ts-external/psatest \ + file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=../ts/ts-external/psatest \ + file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=../ts/ts-external/psatest \ + file://0004-Remove-RSA-support.patch;patchdir=../ts/ts-external/psatest \ " 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 aacd09c3..f0421577 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 @@ -9,17 +9,17 @@ DEPENDS += "python3-jsonschema-native python3-jinja2-native" DEPENDS += "libpsats" RDEPENDS:${PN} += "libpsats" -SRC_URI += "git://github.com/ARM-software/psa-arch-tests.git;name=psatest;protocol=https;branch=main;destsuffix=psatest \ - file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-native.patch;patchdir=../psatest \ +SRC_URI += "git://github.com/ARM-software/psa-arch-tests.git;name=psatest;protocol=https;branch=main;destsuffix=ts/ts-external/psatest \ + file://0001-Pass-Yocto-build-settings-to-psa-arch-tests-native.patch;patchdir=../ts/ts-external/psatest \ " SRCREV_psatest = "74dc6646ff594e131a726a5305aba77bac30eceb" -LIC_FILES_CHKSUM += "file://../psatest/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" +LIC_FILES_CHKSUM += "file://${S}/ts-external/psatest/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" -EXTRA_OECMAKE += "-DPSA_ARCH_TESTS_SOURCE_DIR=${WORKDIR}/sources/psatest" +EXTRA_OECMAKE += "-DPSA_ARCH_TESTS_SOURCE_DIR=${S}/ts-external/psatest" do_apply_local_src_patches:append() { - apply_local_src_patches ${S}/external/psa_arch_tests ${WORKDIR}/sources/psatest + apply_local_src_patches ${S}/external/psa_arch_tests ${S}/ts-external/psatest } FILES:${PN} = "${bindir}/${PSA_TEST}"