From 327cd94f49dfe34164a597ec97573b2b7cc87e72 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 11 Apr 2020 22:45:31 -0700
Subject: [PATCH] optee-os: Mark recipes dormant by default

All arm SOCs may not support optee and there are non-arm machines too
this makes this recipe fit into mutli-BSP environments, platforms which
support optee should be specifically called out via COMPATIBLE_MACHINE,
for general case it remains 'null'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-security/optee/optee-client_git.bb   | 2 ++
 meta-arm/recipes-security/optee/optee-examples_git.bb | 2 ++
 meta-arm/recipes-security/optee/optee-os_git.bb       | 1 +
 meta-arm/recipes-security/optee/optee-test_git.bb     | 1 +
 meta-arm/recipes-security/optee/optee.inc             | 2 ++
 5 files changed, 8 insertions(+)
 create mode 100644 meta-arm/recipes-security/optee/optee.inc

diff --git a/meta-arm/recipes-security/optee/optee-client_git.bb b/meta-arm/recipes-security/optee/optee-client_git.bb
index a25d3437..bae7b20f 100644
--- a/meta-arm/recipes-security/optee/optee-client_git.bb
+++ b/meta-arm/recipes-security/optee/optee-client_git.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
 PV = "3.8.0+git${SRCPV}"
 
+require optee.inc
+
 inherit python3native systemd
 
 SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
diff --git a/meta-arm/recipes-security/optee/optee-examples_git.bb b/meta-arm/recipes-security/optee/optee-examples_git.bb
index 768a55b1..996e2cd5 100644
--- a/meta-arm/recipes-security/optee/optee-examples_git.bb
+++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
@@ -11,6 +11,8 @@ DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
 
 inherit python3native
 
+require optee.inc
+
 SRC_URI = "git://github.com/linaro-swg/optee_examples.git"
 SRCREV = "559b2141c16bf0f57ccd72f60e4deb84fc2a05b0"
 
diff --git a/meta-arm/recipes-security/optee/optee-os_git.bb b/meta-arm/recipes-security/optee/optee-os_git.bb
index 47ced12e..5c420b70 100644
--- a/meta-arm/recipes-security/optee/optee-os_git.bb
+++ b/meta-arm/recipes-security/optee/optee-os_git.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 PV = "3.8.0+git${SRCPV}"
 
 inherit deploy python3native
+require optee.inc
 
 DEPENDS = "python3-pycrypto-native python3-pyelftools-native python3-pycryptodomex-native"
 
diff --git a/meta-arm/recipes-security/optee/optee-test_git.bb b/meta-arm/recipes-security/optee/optee-test_git.bb
index 752d75d3..ee73a2c6 100644
--- a/meta-arm/recipes-security/optee/optee-test_git.bb
+++ b/meta-arm/recipes-security/optee/optee-test_git.bb
@@ -6,6 +6,7 @@ LICENSE = "BSD & GPLv2"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 inherit python3native
+require optee.inc
 
 DEPENDS = "optee-client optee-os python3-pycryptodomex-native"
 
diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
new file mode 100644
index 00000000..a12521dc
--- /dev/null
+++ b/meta-arm/recipes-security/optee/optee.inc
@@ -0,0 +1,2 @@
+COMPATIBLE_MACHINE = "null"
+# Please add supported machines below