Merge pull request #2660 from lucianogdittgen/oelint-vars-outofcontext

Set FILESEXTRAPATHS only where it is needed

7 files changed, 6 insertions, 12 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index ad9642265..d6a4a8c4c 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -66,7 +66,6 @@ PE = "1"
 
 inherit fsl-eula-unpack
 
-FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 
 S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.28.1.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.28.1.bb
index 808a35d20..de258cb3c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.28.1.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.28.1.bb
@@ -8,8 +8,6 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
 
 PNREAL = "gst-rtsp-server"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
            file://0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch \
            "
diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc
index 06cc89a22..a03cd6645 100644
--- a/recipes-security/optee-imx/optee-client-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc
@@ -5,7 +5,6 @@ require optee-client-fslc.inc
 
 DEPENDS += "util-linux-libuuid"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/optee-client:"
 SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${SRCBRANCH} "
 OPTEE_CLIENT_SRC ?= "git://github.com/nxp-imx/imx-optee-client.git;protocol=https"
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
index ed11d0ca6..18b9293ff 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -4,8 +4,6 @@ require optee-os-fslc.inc
 
 DEPENDS:append:arm = " u-boot-mkimage-native"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
-
 SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${SRCBRANCH} "
 SRC_URI:remove = "file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
diff --git a/recipes-security/optee-imx/optee-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
index bc961f190..922f3a8af 100644
--- a/recipes-security/optee-imx/optee-test-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -6,8 +6,6 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "optee"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
-
 SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} "
 
diff --git a/recipes-security/optee-qoriq/optee-client.nxp.inc b/recipes-security/optee-qoriq/optee-client.nxp.inc
index 590540cd8..7a70d49c2 100644
--- a/recipes-security/optee-qoriq/optee-client.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-client.nxp.inc
@@ -4,6 +4,12 @@ require recipes-security/optee-imx/optee-client-fslc.inc
 
 # The patch same as imx-optee, so point FILESEXTRAPATHS to optee-imx/optee-client,
 # avoid duplicate copy files to optee-qoriq
+# The entry cannot be dropped: this recipe's BPN is optee-client-qoriq, so the
+# default FILESPATH only searches directories named after it, and the shared
+# i.MX directory that holds tee-supplicant.sh is unreachable without this line.
+# The entry also keeps the files this include adds to SRC_URI reachable when a
+# recipe in another layer requires the include.
+# nooelint: oelint.vars.outofcontext
 FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-client:"
 
 DEPENDS = "util-linux-libuuid"
diff --git a/recipes-security/optee-qoriq/optee-os.nxp.inc b/recipes-security/optee-qoriq/optee-os.nxp.inc
index 270d23c3b..a6ac986af 100644
--- a/recipes-security/optee-qoriq/optee-os.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-os.nxp.inc
@@ -3,10 +3,6 @@ require recipes-security/optee-imx/optee-os-fslc.inc
 
 DEPENDS:append = " dtc-native"
 
-# The patch same as imx-optee, so point FILESEXTRAPATHS to optee-imx/optee-client,
-# avoid duplicate copy files to optee-qoriq
-FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-os:"
-
 SRC_URI:remove = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 SRC_URI:prepend = "${OPTEE_OS_SRC};branch=${OPTEE_OS_BRANCH} "