From 868758cc6610e22a111c0307464182c1a1ffe35a Mon Sep 17 00:00:00 2001
From: California Sullivan <california.l.sullivan@intel.com>
Date: Mon, 11 Sep 2017 17:31:27 -0700
Subject: linux-yocto: fix Yocto Project Compatibility issues

FILESEXTRAPATHS was being set globally for every linux-yocto recipe. Use
the intel-x86-common MACHINEOVERRIDE on each to fix the issue.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 common/recipes-kernel/linux/linux-yocto-dev.bbappend       | 2 +-
 common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend    | 2 +-
 common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend | 2 +-
 common/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend | 2 +-
 common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend  | 2 +-
 common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend  | 2 +-
 common/recipes-kernel/linux/linux-yocto_4.4.bbappend       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'common/recipes-kernel')

diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
index 3b1382c6..ee33ecc3 100644
--- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
index 3a346400..9a64eb39 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 LINUX_VERSION_INTEL_COMMON = "4.4.76"
 SRCREV_META_INTEL_COMMON ?= "fbb3579c4011befe15368fea05f600d37b3444ba"
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
index 28741825..b8d3d81c 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 KERNEL_FEATURES_INTEL_COMMON ?= ""
 
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
index 28741825..b8d3d81c 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 KERNEL_FEATURES_INTEL_COMMON ?= ""
 
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
index 1f678cbe..d464b422 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar"
 
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend
index 602670e6..9ecdb95a 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar"
 
diff --git a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
index c20f7482..0c193821 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
 
 LINUX_VERSION_INTEL_COMMON = "4.4.76"
 SRCREV_META_INTEL_COMMON = "fbb3579c4011befe15368fea05f600d37b3444ba"
-- 
cgit v1.2.3-54-g00ecf