From: Jon Mason jon.mason@arm.com

Support for OPTEE is being done in the meta-arm layer now. Remove support here in favor of that.

Signed-off-by: Jon Mason jon.mason@arm.com --- meta-optee/COPYING.MIT | 17 ----- meta-optee/conf/layer.conf | 11 --- .../recipes-security/optee/optee-client.bb | 35 ---------- .../optee/optee-client/tee-supplicant.service | 10 --- .../recipes-security/optee/optee-examples.bb | 42 ----------- ...ow-setting-sysroot-for-libgcc-lookup.patch | 13 ---- .../recipes-security/optee/optee-os_git.bb | 69 ------------------- .../recipes-security/optee/optee-test_git.bb | 49 ------------- 8 files changed, 246 deletions(-) delete mode 100644 meta-optee/COPYING.MIT delete mode 100644 meta-optee/conf/layer.conf delete mode 100644 meta-optee/recipes-security/optee/optee-client.bb delete mode 100644 meta-optee/recipes-security/optee/optee-client/tee-supplicant.service delete mode 100644 meta-optee/recipes-security/optee/optee-examples.bb delete mode 100644 meta-optee/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch delete mode 100644 meta-optee/recipes-security/optee/optee-os_git.bb delete mode 100644 meta-optee/recipes-security/optee/optee-test_git.bb

diff --git a/meta-optee/COPYING.MIT b/meta-optee/COPYING.MIT deleted file mode 100644 index fb950dc69feb..000000000000 --- a/meta-optee/COPYING.MIT +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/meta-optee/conf/layer.conf b/meta-optee/conf/layer.conf deleted file mode 100644 index 6b58d43fe101..000000000000 --- a/meta-optee/conf/layer.conf +++ /dev/null @@ -1,11 +0,0 @@ -# We might have a conf and classes directory, append to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" - -BBFILE_COLLECTIONS += "meta-optee" -BBFILE_PATTERN_meta-optee := "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-optee = "8" - -LAYERSERIES_COMPAT_meta-optee = "honister" diff --git a/meta-optee/recipes-security/optee/optee-client.bb b/meta-optee/recipes-security/optee/optee-client.bb deleted file mode 100644 index 28cd35463cc0..000000000000 --- a/meta-optee/recipes-security/optee/optee-client.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "OPTEE Client" -HOMEPAGE = "https://github.com/OP-TEE/optee_client" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" - -PV = "3.7.0+git${SRCPV}" - -inherit python3native systemd - -SRC_URI = "git://github.com/OP-TEE/optee_client.git \ - file://tee-supplicant.service" -S = "${WORKDIR}/git" - -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe" - -SYSTEMD_SERVICE:${PN} = "tee-supplicant.service" - -do_install() { - oe_runmake install - - install -D -p -m0755 ${S}/out/export/usr/sbin/tee-supplicant ${D}${sbindir}/tee-supplicant - - install -D -p -m0644 ${S}/out/export/usr/lib/libteec.so.1.0 ${D}${libdir}/libteec.so.1.0 - ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so - ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1 - - cp -a ${S}/out/export/usr/include ${D}/usr/ - - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - ${WORKDIR}/tee-supplicant.service - - install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service -} diff --git a/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service b/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service deleted file mode 100644 index ffb54d3900d2..000000000000 --- a/meta-optee/recipes-security/optee/optee-client/tee-supplicant.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=TEE Supplicant - -[Service] -User=root -EnvironmentFile=-/etc/default/tee-supplicant -ExecStart=/usr/sbin/tee-supplicant $OPTARGS - -[Install] -WantedBy=basic.target diff --git a/meta-optee/recipes-security/optee/optee-examples.bb b/meta-optee/recipes-security/optee/optee-examples.bb deleted file mode 100644 index f590c44470b3..000000000000 --- a/meta-optee/recipes-security/optee/optee-examples.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "OP-TEE examples" -HOMEPAGE = "https://github.com/linaro-swg/optee_examples" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" - -DEPENDS = "optee-client optee-os python3-pycrypto-native" - -inherit python3native - -SRC_URI = "git://github.com/linaro-swg/optee_examples.git" -SRCREV = "559b2141c16bf0f57ccd72f60e4deb84fc2a05b0" - -S = "${WORKDIR}/git" - -OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}" -TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}" -TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta" - -EXTRA_OEMAKE = " TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ - OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \ - TEEC_EXPORT=${TEEC_EXPORT} \ - HOST_CROSS_COMPILE=${TARGET_PREFIX} \ - TA_CROSS_COMPILE=${TARGET_PREFIX} \ - V=1 \ - " - -do_compile() { - oe_runmake -} - -do_install () { - mkdir -p ${D}${nonarch_base_libdir}/optee_armtz - mkdir -p ${D}${bindir} - install -D -p -m0755 ${S}/out/ca/* ${D}${bindir} - install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz -} - -FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" - -# Imports machine specific configs from staging to build -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-optee/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch b/meta-optee/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch deleted file mode 100644 index 17127d0b0819..000000000000 --- a/meta-optee/recipes-security/optee/optee-os/0001-allow-setting-sysroot-for-libgcc-lookup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mk/gcc.mk b/mk/gcc.mk -index fc38c4d..77b8d74 100644 ---- a/mk/gcc.mk -+++ b/mk/gcc.mk -@@ -12,7 +12,7 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ - -print-file-name=include 2> /dev/null) - - # Get location of libgcc from gcc --libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ -+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ - -print-libgcc-file-name 2> /dev/null) - - # Define these to something to discover accidental use diff --git a/meta-optee/recipes-security/optee/optee-os_git.bb b/meta-optee/recipes-security/optee/optee-os_git.bb deleted file mode 100644 index 581233f9ff39..000000000000 --- a/meta-optee/recipes-security/optee/optee-os_git.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "OP-TEE Trusted OS" -DESCRIPTION = "OPTEE OS" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" - -PV="3.7.0+git${SRCPV}" - -inherit deploy python3native - -DEPENDS = "python3-pycrypto-native python3-pyelftools-native" - -SRCREV = "a2fa5018cb595a9cd9ab62e82c7485ca57a62084" -SRC_URI = "git://github.com/OP-TEE/optee_os.git \ - file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ - " - -S = "${WORKDIR}/git" - -OPTEEMACHINE ?= "${MACHINE}" -OPTEEOUTPUTMACHINE ?= "${MACHINE}" - -EXTRA_OEMAKE = "PLATFORM=${OPTEEMACHINE} CFG_ARM64_core=y \ - CROSS_COMPILE_core=${HOST_PREFIX} \ - CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \ - NOWERROR=1 \ - ta-targets=ta_arm64 \ - LDFLAGS= \ - LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \ - " - -OPTEE_ARCH:armv7a = "arm32" -OPTEE_ARCH:aarch64 = "arm64" - -do_compile() { - unset LDFLAGS - oe_runmake all CFG_TEE_TA_LOG_LEVEL=0 -} - -do_install() { - #install core on boot directory - install -d ${D}${nonarch_base_libdir}/firmware/ - - install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.bin ${D}${nonarch_base_libdir}/firmware/ - #install TA devkit - install -d ${D}/usr/include/optee/export-user_ta/ - - for f in ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/export-ta_${OPTEE_ARCH}/* ; do - cp -aR $f ${D}/usr/include/optee/export-user_ta/ - done -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_deploy() { - install -d ${DEPLOYDIR}/optee - for f in ${D}${nonarch_base_libdir}/firmware/*; do - install -m 644 $f ${DEPLOYDIR}/optee/ - done -} - -addtask deploy before do_build after do_install - -FILES:${PN} = "${nonarch_base_libdir}/firmware/" -FILES:${PN}-dev = "/usr/include/optee" - -INSANE_SKIP:${PN}-dev = "staticdev" - -INHIBIT_PACKAGE_STRIP = "1" diff --git a/meta-optee/recipes-security/optee/optee-test_git.bb b/meta-optee/recipes-security/optee/optee-test_git.bb deleted file mode 100644 index 15d66ee8d145..000000000000 --- a/meta-optee/recipes-security/optee/optee-test_git.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "OP-TEE sanity testsuite" -HOMEPAGE = "https://github.com/OP-TEE/optee_test" - -LICENSE = "BSD & GPLv2" -LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" - -inherit python3native - -DEPENDS = "optee-client optee-os python3-pycrypto-native" - -PV = "3.7.0+git${SRCPV}" - -SRC_URI = "git://github.com/OP-TEE/optee_test.git \ - " -S = "${WORKDIR}/git" - -SRCREV = "227d6f4c40eaa6f84fe049b9e48c7b27ad7fab08" - -OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}" -TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}" -TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta" - -EXTRA_OEMAKE = " TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ - OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \ - TEEC_EXPORT=${TEEC_EXPORT} \ - CROSS_COMPILE_HOST=${TARGET_PREFIX} \ - CROSS_COMPILE_TA=${TARGET_PREFIX} \ - V=1 \ - " - -do_compile() { - # Top level makefile doesn't seem to handle parallel make gracefully - oe_runmake xtest - oe_runmake ta -} - -do_install () { - install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest - - # install path should match the value set in optee-client/tee-supplicant - # default TEEC_LOAD_PATH is /lib - mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/ - install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/ -} - -FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" - -# Imports machine specific configs from staging to build -PACKAGE_ARCH = "${MACHINE_ARCH}"