From patchwork Tue Jan 17 13:24:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emekcan Aras X-Patchwork-Id: 18246 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 B48A9C677F1 for ; Tue, 17 Jan 2023 13:24:54 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.195940.1673961892198350657 for ; Tue, 17 Jan 2023 05:24:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: emekcan.aras@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 D9CE9C14; Tue, 17 Jan 2023 05:25:33 -0800 (PST) Received: from cassini-003.cambridge.arm.com (cassini-003.cambridge.arm.com [10.1.198.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E920E3F67D; Tue, 17 Jan 2023 05:24:50 -0800 (PST) From: emekcan.aras@arm.com To: meta-arm@lists.yoctoproject.org, Jon.Mason@arm.com, Ross.Burton@arm.com Cc: nd@arm.com, Emekcan Aras Subject: [PATCH 1/1] arm/optee: Cleaning optee-os-3.19 recipe Date: Tue, 17 Jan 2023 13:24:41 +0000 Message-Id: <20230117132441.44548-2-emekcan.aras@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230117132441.44548-1-emekcan.aras@arm.com> References: <20230117132441.44548-1-emekcan.aras@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 ; Tue, 17 Jan 2023 13:24:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4290 From: Emekcan Aras Removes the optee-os_3.19.inc file since optee-os.inc is very similar and cleans optee-os.inc. Signed-off-by: Emekcan Aras --- .../recipes-security/optee/optee-os-3_19.inc | 82 ------------------- meta-arm/recipes-security/optee/optee-os.inc | 6 +- .../recipes-security/optee/optee-os_3.19.0.bb | 2 +- 3 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 meta-arm/recipes-security/optee/optee-os-3_19.inc diff --git a/meta-arm/recipes-security/optee/optee-os-3_19.inc b/meta-arm/recipes-security/optee/optee-os-3_19.inc deleted file mode 100644 index 61475dcf..00000000 --- a/meta-arm/recipes-security/optee/optee-os-3_19.inc +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "OP-TEE Trusted OS" -DESCRIPTION = "Open Portable Trusted Execution Environment - Trusted side of the TEE" -HOMEPAGE = "https://www.op-tee.org/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" - -inherit deploy python3native -require optee.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-3.19.0:" - -CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os" - -DEPENDS = "python3-pyelftools-native python3-cryptography-native" - -DEPENDS:append:toolchain-clang = " compiler-rt" - -SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" - -SRC_URI:append = " \ - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ - file://0007-allow-setting-sysroot-for-clang.patch \ - file://0008-no-warn-rwx-segments.patch \ - " - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -EXTRA_OEMAKE += " \ - PLATFORM=${OPTEEMACHINE} \ - CFG_${OPTEE_CORE}_core=y \ - CROSS_COMPILE_core=${HOST_PREFIX} \ - CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \ - NOWERROR=1 \ - ta-targets=ta_${OPTEE_ARCH} \ - O=${B} \ -" -EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}" -EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}" - -CFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -CPPFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -do_compile:prepend() { - PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name) -} - -do_compile() { - oe_runmake -C ${S} all -} -do_compile[cleandirs] = "${B}" - -do_install() { - #install core in firmware - install -d ${D}${nonarch_base_libdir}/firmware/ - install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_deploy() { - install -d ${DEPLOYDIR}/${MLPREFIX}optee - install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/${MLPREFIX}optee -} - -addtask deploy before do_build after do_install - -SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" - -FILES:${PN} = "${nonarch_base_libdir}/firmware/" - -# note: "textrel" is not triggered on all archs -INSANE_SKIP:${PN} = "textrel" -# Build paths are currently embedded -INSANE_SKIP:${PN} += "buildpaths" -INSANE_SKIP:${PN}-dev = "staticdev" -INHIBIT_PACKAGE_STRIP = "1" - diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index a03ea6a3..5d1df55b 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" inherit deploy python3native require optee.inc +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-3.19.0:" + CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os" DEPENDS = "python3-pyelftools-native python3-cryptography-native" @@ -43,10 +45,6 @@ CPPFLAGS[unexport] = "1" AS[unexport] = "1" LD[unexport] = "1" -do_compile:prepend() { - PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name) -} - do_compile() { oe_runmake -C ${S} all } diff --git a/meta-arm/recipes-security/optee/optee-os_3.19.0.bb b/meta-arm/recipes-security/optee/optee-os_3.19.0.bb index 656a0974..97aff5aa 100644 --- a/meta-arm/recipes-security/optee/optee-os_3.19.0.bb +++ b/meta-arm/recipes-security/optee/optee-os_3.19.0.bb @@ -1,4 +1,4 @@ -require optee-os-3_19.inc +require optee-os.inc DEPENDS += "dtc-native"