From 3b62a609262c3ebca35200de5651aac2bfec27fd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 28 Apr 2021 11:29:03 +0100 Subject: [PATCH] arm/linux: guard FILESEXTRAPATHS changes in overrides Because of how the kernel class searches for files any changes to FILESEXTRAPATHS should be done in an override so it doesn't potentially impact unrelated builds. Issue spotted by running yocto-check-layer. Change-Id: I3e915a0cafc850d4b2594b655a849977d389465a Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend index be2545f0..7f7590b0 100644 --- a/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend +++ b/meta-arm/recipes-kernel/linux/linux-yocto_5.10.bbappend @@ -1,12 +1,15 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +ARMFILESPATHS := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE_generic-arm64 = "generic-arm64" +FILESEXTRAPATHS_prepend_generic-arm64 = "${ARMFILESPATHS}" SRC_URI_append_generic-arm64 = " \ file://defconfig.patch \ " +FILESEXTRAPATHS_prepend_qemuarm64-sbsa = "${ARMFILESPATHS}" SRC_URI_append_qemuarm64-sbsa = " \ file://defconfig.patch \ " +FILESEXTRAPATHS_prepend_qemuarm64-secureboot = "${ARMFILESPATHS}" SRC_URI_append_qemuarm64-secureboot = " file://zone_dma_revert.patch"