From 6c7399be0c4cbbda98319d90d3505d0ba9a587c5 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Tue, 19 Jul 2022 21:13:50 +0100
Subject: [PATCH] arm/optee: ignore buildpath warnings

Latest oe-core has enabled the buildpaths QA check, which warns if the
build paths are present inside binaries. This is because build paths in
deployed binaries is both information leakage and non-reproducible.

Until this is fixed, skip this check.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb | 3 +++
 meta-arm/recipes-security/optee/optee-os.inc                | 3 ++-
 meta-arm/recipes-security/optee/optee-spdevkit_git.bb       | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb
index 5d54d4ed..5ff373ad 100644
--- a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb
+++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb
@@ -20,3 +20,6 @@ do_deploy() {
 }
 
 FILES:${PN} = "${includedir}/optee/"
+
+# Build paths are currently embedded
+INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc
index eee715f5..8942facd 100644
--- a/meta-arm/recipes-security/optee/optee-os.inc
+++ b/meta-arm/recipes-security/optee/optee-os.inc
@@ -63,7 +63,8 @@ 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-spdevkit_git.bb b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
index def2d8d9..7608cec0 100644
--- a/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
+++ b/meta-arm/recipes-security/optee/optee-spdevkit_git.bb
@@ -301,3 +301,5 @@ COMPATIBLE_HOST = "aarch64.*-linux"
 
 # optee-spdevkit static library is part of optee-os image. No need to package this library in a staticdev package
 INSANE_SKIP:${PN}-dev = "staticdev"
+# Build paths are currently embedded
+INSANE_SKIP:${PN}-dev += "buildpaths"