From 9d374c6460a3f7b6286f795fc47ec578d2b68912 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 16 Feb 2022 12:40:17 -0600 Subject: [PATCH] optee-*: For i.MX, require machine feature optee The optee software should be enabled by the machine feature. If the machine feature is not there, but optee is built anyway, then something is wrong and the build should fail. Signed-off-by: Tom Hochstein --- recipes-security/optee-imx/optee-client_3.15.0.imx.bb | 6 ++++-- recipes-security/optee-imx/optee-os_3.15.0.imx.bb | 4 +++- recipes-security/optee-imx/optee-test_3.15.0.imx.bb | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/recipes-security/optee-imx/optee-client_3.15.0.imx.bb b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb index dcfee307..68c73727 100644 --- a/recipes-security/optee-imx/optee-client_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.15.0.imx.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2020 NXP +# Copyright (C) 2017-2021 NXP SUMMARY = "OPTEE Client libs" HOMEPAGE = "http://www.optee.org/" @@ -16,7 +16,9 @@ SRCREV = "182874320395787a389e5b0f7df02b32f3c0a1b0" S = "${WORKDIR}/git" B = "${WORKDIR}/build" -inherit python3native systemd +inherit python3native systemd features_check + +REQUIRED_MACHINE_FEATURES = "optee" SYSTEMD_SERVICE:${PN} = "tee-supplicant.service" diff --git a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb index 58b238a7..ffa3cc85 100644 --- a/recipes-security/optee-imx/optee-os_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.15.0.imx.bb @@ -17,7 +17,9 @@ SRCREV = "c939619d64dea014ad1b8382356eee4d1cbfbb22" S = "${WORKDIR}/git" -inherit deploy python3native autotools +inherit deploy python3native autotools features_check + +REQUIRED_MACHINE_FEATURES = "optee" # The platform flavor corresponds to the Yocto machine without the leading 'i'. PLATFORM_FLAVOR = "${@d.getVar('MACHINE')[1:]}" diff --git a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb index 22194a39..fd6ef926 100644 --- a/recipes-security/optee-imx/optee-test_3.15.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.15.0.imx.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2020 NXP +# Copyright (C) 2017-2021 NXP SUMMARY = "OPTEE test" HOMEPAGE = "http://www.optee.org/" @@ -17,7 +17,9 @@ B = "${WORKDIR}/build" SRCREV = "4d81b964a72e89a62d04187b3f055d8346b383c9" -inherit python3native +inherit python3native features_check + +REQUIRED_MACHINE_FEATURES = "optee" OPTEE_ARCH ?= "arm32" OPTEE_ARCH:armv7a = "arm32" -- 2.40.1