linux : Use overrides to prevent global application of SRC_URI_appends.

Limt the scope of the SRC_URI additions to the machine/soc they apply to. If
this layer is used with other BSP's, the patches may cause problem with
other linux-yocto bbappends.

Signed-off-by: Philip Balister <philip@balister.org>

2 files changed, 8 insertions, 7 deletions

diff --git a/recipes-kernel/linux/linux-xlnx_3.8.bb b/recipes-kernel/linux/linux-xlnx_3.8.bb
index 9310cd1b..ce54dc9b 100644
--- a/recipes-kernel/linux/linux-xlnx_3.8.bb
+++ b/recipes-kernel/linux/linux-xlnx_3.8.bb
@@ -8,6 +8,6 @@ LINUX_VERSION = "3.8"
 SRCREV = "6a0bedad60e2bca8d9b50bf81b9895e29e31a6d7"
 
 # MicroBlaze patches
-SRC_URI_append = " \
+SRC_URI_append_microblaze = " \
                 file://microblaze-patches_v3.8.scc \
                 "
diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 2e62239c..100fad14 100644
--- a/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -4,13 +4,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 
 require linux-machine-common.inc
 
-SRC_URI_append += " \
-        file://xilinx-v14.5_modifications_to_v3.8.scc \
-        file://microblaze-patches_v3.8.scc \
-        file://${KMACHINE}-standard.scc \
-        "
+SRC_URI_append_zynq = " file://xilinx-v14.5_modifications_to_v3.8.scc"
+SRC_URI_append_zynq = " file://microblaze-patches_v3.8.scc"
+SRC_URI_append_zynq   = " file://zynq-default-standard.scc"
+SRC_URI_append_microblaze   = " file://zynq-microblaze-standard.scc"
 
 SRC_URI_append += "git://github.com/Xilinx/xilinx-kernel-cache;protocol=git;branch=master;type=kmeta;name=externalcache;destsuffix=external-cache/"
 SRCREV_externalcache = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "zynq|microblaze"
+COMPATIBLE_MACHINE_zynq = "zynq"
+COMPATIBLE_MACHINE_microblaze = "microblaze"
+