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 <tom.hochstein@nxp.com>

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 dcfee307da3b938d1d78448787bbe74c94761e9f..68c73727ea7c9b7ddb445acdf4004a3abd6e2b6f 100644 (file)
--- 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 58b238a7faadb83d9935a553db4fe325d9080fcc..ffa3cc850082f9917209cc3cea78b5d804a2a398 100644 (file)
--- 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 22194a39ea098d4c630c3876989cb0cf5bfcc7f3..fd6ef92633717aa158b45fd143cdb40c2fce2c39 100644 (file)
--- 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"