From 4ca18c758b09d23eb4142045750bb66a8138f2c4 Mon Sep 17 00:00:00 2001 From: Matteo Facchinetti Date: Mon, 24 Jul 2023 11:12:43 +0200 Subject: recipes-security: fix SMW direcrory name changing from swm to smw Signed-off-by: Matteo Facchinetti (cherry picked from commit 86383b4ae6096c24ff80ecafa0f38674772e7886) --- recipes-security/smw/keyctl-caam_git.bb | 23 ++++++++++++ recipes-security/smw/smw_git.bb | 64 +++++++++++++++++++++++++++++++++ recipes-security/swm/keyctl-caam_git.bb | 23 ------------ recipes-security/swm/smw_git.bb | 64 --------------------------------- 4 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 recipes-security/smw/keyctl-caam_git.bb create mode 100644 recipes-security/smw/smw_git.bb delete mode 100644 recipes-security/swm/keyctl-caam_git.bb delete mode 100644 recipes-security/swm/smw_git.bb diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb new file mode 100644 index 00000000..25a5f656 --- /dev/null +++ b/recipes-security/smw/keyctl-caam_git.bb @@ -0,0 +1,23 @@ +# Copyright 2020-2022 NXP + +SUMMARY = "NXP i.MX CAAM Keyctl" +DESCRIPTION = "NXP i.MX keyctl tool to manage CAAM Keys" +SECTION = "base" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8636bd68fc00cc6a3809b7b58b45f982" + +SRCBRANCH = "master" +SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCBRANCH}" + +SRCREV = "81dc06cdb9c4d0d4ba10459d85af9a8603774948" + +S = "${WORKDIR}/git" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + oe_runmake DESTDIR=${D} install +} + +COMPATIBLE_MACHINE = "(imx-generic-bsp)" + diff --git a/recipes-security/smw/smw_git.bb b/recipes-security/smw/smw_git.bb new file mode 100644 index 00000000..3f77ad06 --- /dev/null +++ b/recipes-security/smw/smw_git.bb @@ -0,0 +1,64 @@ +# Copyright 2020-23 NXP + +SUMMARY = "NXP i.MX Security Middleware Library" +DESCRIPTION = "NXP i.MX Security Middleware Library" +SECTION = "base" +LICENSE = "BSD-3-Clause" +LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982 \ + file://../psa-arch-tests/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" + +DEPENDS = "json-c optee-os optee-client python3-cryptography-native" +DEPENDS:append:mx8qxp-nxp-bsp = " imx-seco-libs" +DEPENDS:append:mx8dx-nxp-bsp = " imx-seco-libs" +DEPENDS:append:mx8ulp-nxp-bsp = " imx-secure-enclave" + +SRC_URI = "git://github.com/nxp-imx/imx-smw.git;protocol=https;branch=release/version_2.x;name=smw;destsuffix=git/smw \ + git://github.com/ARM-software/psa-arch-tests.git;protocol=https;branch=main;name=psa;destsuffix=git/psa-arch-tests \ + " +SRCREV_smw = "f0570b3e8cb5f68d54edc4f9dd7cb984f6f604ed" +SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02" +SRCREV_FORMAT = "smw_psa" +S = "${WORKDIR}/git/smw" + +inherit cmake python3native + +CFLAGS[unexport] = "1" +CPPFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" + +# setting the linker options +TARGET_LDFLAGS:remove = "${DEBUG_PREFIX_MAP}" + +OPTEE_OS_TA_EXPORT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64" +OPTEE_OS_TA_EXPORT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32" + +# Needs to sign OPTEE TAs +export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" + +EXTRA_OECMAKE = " \ + -DTA_DEV_KIT_ROOT=${OPTEE_OS_TA_EXPORT_DIR} \ + -DTEEC_ROOT=${STAGING_DIR_HOST} \ + -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr" \ + -DPSA_ARCH_TESTS_SRC_PATH=../${PSA_ARCH_TESTS_SRC_PATH} \ +" +EXTRA_OECMAKE:append:mx8qxp-nxp-bsp = "-DSECO_ROOT=${STAGING_DIR_HOST}" +EXTRA_OECMAKE:append:mx8dx-nxp-bsp = "-DSECO_ROOT=${STAGING_DIR_HOST}" +EXTRA_OECMAKE:append:mx8ulp-nxp-bsp = "-DELE_ROOT=${STAGING_DIR_HOST}" +EXTRA_OECMAKE_IMX:mx93-nxp-bsp = "-DELE_ROOT=${STAGING_DIR_HOST}" + +OECMAKE_TARGET_COMPILE += "build_tests" +OECMAKE_TARGET_INSTALL += "install_tests" + +INSANE_SKIP_${PN}-tests = "textrel" + +PACKAGES =+ "${PN}-tests" + +FILES:${PN} += "${base_libdir}/optee_armtz/*" + +FILES:${PN}-tests = "${bindir}/* ${datadir}/${BPN}/*" + +RDEPENDS:${PN}-tests += "bash cmake" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-security/swm/keyctl-caam_git.bb b/recipes-security/swm/keyctl-caam_git.bb deleted file mode 100644 index 25a5f656..00000000 --- a/recipes-security/swm/keyctl-caam_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2022 NXP - -SUMMARY = "NXP i.MX CAAM Keyctl" -DESCRIPTION = "NXP i.MX keyctl tool to manage CAAM Keys" -SECTION = "base" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8636bd68fc00cc6a3809b7b58b45f982" - -SRCBRANCH = "master" -SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCBRANCH}" - -SRCREV = "81dc06cdb9c4d0d4ba10459d85af9a8603774948" - -S = "${WORKDIR}/git" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - oe_runmake DESTDIR=${D} install -} - -COMPATIBLE_MACHINE = "(imx-generic-bsp)" - diff --git a/recipes-security/swm/smw_git.bb b/recipes-security/swm/smw_git.bb deleted file mode 100644 index 3f77ad06..00000000 --- a/recipes-security/swm/smw_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2020-23 NXP - -SUMMARY = "NXP i.MX Security Middleware Library" -DESCRIPTION = "NXP i.MX Security Middleware Library" -SECTION = "base" -LICENSE = "BSD-3-Clause" -LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982 \ - file://../psa-arch-tests/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" - -DEPENDS = "json-c optee-os optee-client python3-cryptography-native" -DEPENDS:append:mx8qxp-nxp-bsp = " imx-seco-libs" -DEPENDS:append:mx8dx-nxp-bsp = " imx-seco-libs" -DEPENDS:append:mx8ulp-nxp-bsp = " imx-secure-enclave" - -SRC_URI = "git://github.com/nxp-imx/imx-smw.git;protocol=https;branch=release/version_2.x;name=smw;destsuffix=git/smw \ - git://github.com/ARM-software/psa-arch-tests.git;protocol=https;branch=main;name=psa;destsuffix=git/psa-arch-tests \ - " -SRCREV_smw = "f0570b3e8cb5f68d54edc4f9dd7cb984f6f604ed" -SRCREV_psa = "463cb95ada820bc6f758d50066cf8c0ed5cc3a02" -SRCREV_FORMAT = "smw_psa" -S = "${WORKDIR}/git/smw" - -inherit cmake python3native - -CFLAGS[unexport] = "1" -CPPFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -# setting the linker options -TARGET_LDFLAGS:remove = "${DEBUG_PREFIX_MAP}" - -OPTEE_OS_TA_EXPORT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64" -OPTEE_OS_TA_EXPORT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32" - -# Needs to sign OPTEE TAs -export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" - -EXTRA_OECMAKE = " \ - -DTA_DEV_KIT_ROOT=${OPTEE_OS_TA_EXPORT_DIR} \ - -DTEEC_ROOT=${STAGING_DIR_HOST} \ - -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr" \ - -DPSA_ARCH_TESTS_SRC_PATH=../${PSA_ARCH_TESTS_SRC_PATH} \ -" -EXTRA_OECMAKE:append:mx8qxp-nxp-bsp = "-DSECO_ROOT=${STAGING_DIR_HOST}" -EXTRA_OECMAKE:append:mx8dx-nxp-bsp = "-DSECO_ROOT=${STAGING_DIR_HOST}" -EXTRA_OECMAKE:append:mx8ulp-nxp-bsp = "-DELE_ROOT=${STAGING_DIR_HOST}" -EXTRA_OECMAKE_IMX:mx93-nxp-bsp = "-DELE_ROOT=${STAGING_DIR_HOST}" - -OECMAKE_TARGET_COMPILE += "build_tests" -OECMAKE_TARGET_INSTALL += "install_tests" - -INSANE_SKIP_${PN}-tests = "textrel" - -PACKAGES =+ "${PN}-tests" - -FILES:${PN} += "${base_libdir}/optee_armtz/*" - -FILES:${PN}-tests = "${bindir}/* ${datadir}/${BPN}/*" - -RDEPENDS:${PN}-tests += "bash cmake" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf