From patchwork Mon Jan 15 23:08:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 37885 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 B3BD9C4707B for ; Mon, 15 Jan 2024 23:08:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.98638.1705360089573547377 for ; Mon, 15 Jan 2024 15:08:09 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 203DD2F4 for ; Mon, 15 Jan 2024 15:08:55 -0800 (PST) Received: from H24V3P4C17.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 1294F3F73F for ; Mon, 15 Jan 2024 15:08:08 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] arm/pyhsslms: update to 2.0.0 Date: Mon, 15 Jan 2024 18:08:06 -0500 Message-Id: <20240115230807.79347-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) 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 ; Mon, 15 Jan 2024 23:08:14 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5332 Changes were needed due to the 2.0.0 version not being available for download at pypi (though listed as the latest version there). Signed-off-by: Jon Mason --- .../python/python3-pyhsslms_1.1.1.bb | 10 ---------- .../python/python3-pyhsslms_2.0.0.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 meta-arm/recipes-devtools/python/python3-pyhsslms_1.1.1.bb create mode 100644 meta-arm/recipes-devtools/python/python3-pyhsslms_2.0.0.bb diff --git a/meta-arm/recipes-devtools/python/python3-pyhsslms_1.1.1.bb b/meta-arm/recipes-devtools/python/python3-pyhsslms_1.1.1.bb deleted file mode 100644 index 6012ab2d6cea..000000000000 --- a/meta-arm/recipes-devtools/python/python3-pyhsslms_1.1.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Pure-Python implementation of HSS/LMS Digital Signatures (RFC 8554)" -HOMEPAGE ="https://pypi.org/project/pyhsslms" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=58f6f7065b99f9d01d56e759256a6f1b" - -inherit pypi python_setuptools_build_meta -PYPI_PACKAGE = "pyhsslms" -SRC_URI[sha256sum] = "58bf03e34c6f9d5a3cfd77875d0a1356d4f23d7ad6ffd129b1e60de1208db753" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-arm/recipes-devtools/python/python3-pyhsslms_2.0.0.bb b/meta-arm/recipes-devtools/python/python3-pyhsslms_2.0.0.bb new file mode 100644 index 000000000000..b18d1c8e8685 --- /dev/null +++ b/meta-arm/recipes-devtools/python/python3-pyhsslms_2.0.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Pure-Python implementation of HSS/LMS Digital Signatures (RFC 8554)" +HOMEPAGE ="https://pypi.org/project/pyhsslms" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bbc59ef8bf238c2902ca816b87b58571" + +inherit python_setuptools_build_meta + +# Maintainer refused to upload source to pypi.org, but said he would in a future release. In the meantime, do github +SRC_URI = "git:///github.com/russhousley/pyhsslms.git;branch=master;protocol=https" +SRCREV = "c798728deed6d3f681c9e6bfd7fe8a6705f5638b" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native nativesdk" From patchwork Mon Jan 15 23:08:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 37884 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 B2CFAC3DA79 for ; Mon, 15 Jan 2024 23:08:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.99412.1705360090141951627 for ; Mon, 15 Jan 2024 15:08:10 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 90194FEC for ; Mon, 15 Jan 2024 15:08:55 -0800 (PST) Received: from H24V3P4C17.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 825273F73F for ; Mon, 15 Jan 2024 15:08:08 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] arm/trusted-firmware-m: update to 2.0.0 Date: Mon, 15 Jan 2024 18:08:07 -0500 Message-Id: <20240115230807.79347-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240115230807.79347-1-jon.mason@arm.com> References: <20240115230807.79347-1-jon.mason@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 ; Mon, 15 Jan 2024 23:08:14 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5333 Updated to the latest version. Corstone1000 doesn't seem to boot. So, pull back the old version to meta-arm-bsp for it to use temporarily. Signed-off-by: Jon Mason --- .../conf/machine/include/corstone1000.inc | 3 +- .../trusted-firmware-m-1.8.1-src.inc | 0 ...trusted-firmware-m-scripts-native_1.8.1.bb | 0 .../trusted-firmware-m_1.8.1.bb | 0 .../trusted-firmware-m-2.0.0-src.inc | 46 +++++++++++++++++++ ...trusted-firmware-m-scripts-native_2.0.0.bb | 2 + .../trusted-firmware-m_2.0.0.bb | 2 + 7 files changed, 52 insertions(+), 1 deletion(-) rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc (100%) rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb (100%) rename {meta-arm => meta-arm-bsp}/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb (100%) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 381eaaf36514..d03c23c09c7c 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -12,7 +12,8 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" # TF-M -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" +EXTRA_IMAGEDEPENDS += "trusted-firmware-m" +PREFERRED_VERSION_trusted-firmware-m ?= "1.8.%" # TF-M settings for signing host images TFA_BL2_RE_IMAGE_LOAD_ADDRESS = "0x62353000" diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc new file mode 100644 index 000000000000..82543258d79d --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.0.0-src.inc @@ -0,0 +1,46 @@ +# Common src definitions for trusted-firmware-m and trusted-firmware-m-scripts + +LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0" + +LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ + file://../tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \ + file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ + file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8" + +SRC_URI_TRUSTED_FIRMWARE_M ?= "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS ?= "git://git.trustedfirmware.org/TF-M/tf-m-extras.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_TESTS ?= "git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_MBEDTLS ?= "git://github.com/ARMmbed/mbedtls.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT ?= "git://github.com/mcu-tools/mcuboot.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_QCBOR ?= "git://github.com/laurencelundblade/QCBOR.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;destsuffix=git/tfm \ + ${SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS};branch=${SRCBRANCH_tfm-extras};name=tfm-extras;destsuffix=git/tfm-extras \ + ${SRC_URI_TRUSTED_FIRMWARE_M_TESTS};branch=${SRCBRANCH_tfm-tests};name=tfm-tests;destsuffix=git/tf-m-tests \ + ${SRC_URI_TRUSTED_FIRMWARE_M_MBEDTLS};branch=${SRCBRANCH_mbedtls};name=mbedtls;destsuffix=git/mbedtls \ + ${SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT};branch=${SRCBRANCH_mcuboot};name=mcuboot;destsuffix=git/mcuboot \ + ${SRC_URI_TRUSTED_FIRMWARE_M_QCBOR};branch=${SRCBRANCH_qcbor};name=qcbor;destsuffix=git/qcbor \ + " + +# The required dependencies are documented in tf-m/config/config_default.cmake +# TF-Mv2.0.0 +SRCBRANCH_tfm ?= "release/2.0.x" +SRCREV_tfm = "9ca8a5eb3c85eecee1303dffa262800ea0385584" +# TF-Mv2.0.0 +SRCBRANCH_tfm-extras ?= "release/2.0.x" +SRCREV_tfm-extras = "676a1465f361439bc95f5a50ef71749f27caffc1" +# TF-Mv2.0.0 +SRCBRANCH_tfm-tests ?= "release/2.0.x" +SRCREV_tfm-tests = "69fbb233dc6e45f8306d98694ca5760559f9d2ef" +# mbedtls-3.5.1 +SRCBRANCH_mbedtls ?= "master" +SRCREV_mbedtls = "edb8fec9882084344a314368ac7fd957a187519c" +# mcuboot v2.0.0 +SRCBRANCH_mcuboot ?= "main" +SRCREV_mcuboot = "304fd41980ed929533b9f387dde1b463b0be5b90" +# QCBOR v1.2 +SRCBRANCH_qcbor ?= "master" +SRCREV_qcbor = "b0e7033268e88c9f27146fa9a1415ef4c19ebaff" + +SRCREV_FORMAT = "tfm" + +S = "${WORKDIR}/git/tfm" diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb new file mode 100644 index 000000000000..d50d886f60b2 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.0.0.bb @@ -0,0 +1,2 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb new file mode 100644 index 000000000000..3464f49dd9d1 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.0.0.bb @@ -0,0 +1,2 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc +require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc