optee: resolve include clash with meta-arm

meta-arm already provides optee. Some BSP rely on this version of optee rather than the one provided by lmp. Include files, such as optee-client.inc, clash with meta-arm which the bb recipe from meta-arm use the include from meta-lmp. Append "-fio" to includes provided by meta-lmp so they don't clash with meta-arm. Signed-off-by: Jerome Brunet <[email protected]>
foundriesio · Mar 30, 2022 · 1d369a4 · 1d369a4
1 parent 05ad477
commit 1d369a4
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 11 deletions.
diff --git a/...e/recipes-security/optee/optee-client.inc → ...cipes-security/optee/optee-client-fio.inc b/...e/recipes-security/optee/optee-client.inc → ...cipes-security/optee/optee-client-fio.inc
diff --git a/meta-lmp-base/recipes-security/optee/optee-client_3.10.0.bb b/meta-lmp-base/recipes-security/optee/optee-client_3.10.0.bb
@@ -1,4 +1,4 @@
-require optee-client.inc
+require optee-client-fio.inc
 
 SRCREV = "e7a4706e08c8fbdd53530868a6ac4937193dd73c"
 

diff --git a/meta-lmp-base/recipes-security/optee/optee-client_3.15.0.bb b/meta-lmp-base/recipes-security/optee/optee-client_3.15.0.bb
@@ -1,4 +1,4 @@
-require optee-client.inc
+require optee-client-fio.inc
 
 SRCREV = "182874320395787a389e5b0f7df02b32f3c0a1b0"
 

diff --git a/...recipes-security/optee/optee-examples.inc → ...pes-security/optee/optee-examples-fio.inc b/...recipes-security/optee/optee-examples.inc → ...pes-security/optee/optee-examples-fio.inc
@@ -9,7 +9,7 @@ DEPENDS = "optee-client virtual/optee-os python3-pycryptodomex-native python3-py
 
 inherit python3native
 
-require optee.inc
+require optee-fio.inc
 
 SRC_URI = "git://github.com/linaro-swg/optee_examples.git;protocol=https;branch=master"
 

diff --git a/meta-lmp-base/recipes-security/optee/optee-examples_3.10.0.bb b/meta-lmp-base/recipes-security/optee/optee-examples_3.10.0.bb
@@ -1,4 +1,4 @@
-require optee-examples.inc
+require optee-examples-fio.inc
 
 SRCREV = "c6eb00a9d83bf068a37e4806c97f582bb16e2973"
 

diff --git a/meta-lmp-base/recipes-security/optee/optee-examples_3.15.0.bb b/meta-lmp-base/recipes-security/optee/optee-examples_3.15.0.bb
@@ -1,3 +1,3 @@
-require optee-examples.inc
+require optee-examples-fio.inc
 
 SRCREV = "ff4b493e267d40bcf508acc300da296a3a2adac2"
diff --git a/...lmp-base/recipes-security/optee/optee.inc → ...base/recipes-security/optee/optee-fio.inc b/...lmp-base/recipes-security/optee/optee.inc → ...base/recipes-security/optee/optee-fio.inc
diff --git a/meta-lmp-base/recipes-security/optee/optee-fiovb_git.bb b/meta-lmp-base/recipes-security/optee/optee-fiovb_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=92d506fc36dda404ceb608cdc34b7a99"
 
 DEPENDS = "optee-client"
 
-require optee.inc
+require optee-fio.inc
 
 SRC_URI = "git://github.com/foundriesio/optee-fiovb.git;protocol=https;branch=master"
 SRCREV = "77f2e70751b3a0585b7306dbf322077260ec6dd9"

diff --git a/meta-lmp-base/recipes-security/optee/optee-os-fio.inc b/meta-lmp-base/recipes-security/optee/optee-os-fio.inc
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 
 inherit deploy python3native
-require optee.inc
+require optee-fio.inc
 
 CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 

diff --git a/meta-lmp-base/recipes-security/optee/optee-sks_git.bb b/meta-lmp-base/recipes-security/optee/optee-sks_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31
 
 inherit python3native
 
-require optee.inc
+require optee-fio.inc
 
 DEPENDS = "python3-pycryptodomex-native python3-pycrypto-native virtual/optee-os optee-client"
 

diff --git a/...ase/recipes-security/optee/optee-test.inc → ...recipes-security/optee/optee-test-fio.inc b/...ase/recipes-security/optee/optee-test.inc → ...recipes-security/optee/optee-test-fio.inc
@@ -6,7 +6,7 @@ LICENSE = "BSD & GPLv2"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
 
 inherit python3native
-require optee.inc
+require optee-fio.inc
 
 DEPENDS = "optee-client virtual/optee-os python3-pycryptodomex-native python3-pycrypto-native openssl"
 

diff --git a/meta-lmp-base/recipes-security/optee/optee-test_3.10.0.bb b/meta-lmp-base/recipes-security/optee/optee-test_3.10.0.bb
@@ -1,4 +1,4 @@
-require optee-test.inc
+require optee-test-fio.inc
 
 SRCREV = "30efcbeaf8864d0f2a5c4be593a5411001fab31b"
 

diff --git a/meta-lmp-base/recipes-security/optee/optee-test_3.15.0.bb b/meta-lmp-base/recipes-security/optee/optee-test_3.15.0.bb
@@ -1,4 +1,4 @@
-require optee-test.inc
+require optee-test-fio.inc
 
 SRCREV = "f88f69eb27beda52998de09cd89a7ee422da00d9"