toolchain: use our toolchain under correct conditions

Only use our toolchain versions/patches if we are running our distro
(DISTRO = "fsl") and one of our machines

Signed-off-by: Matthew McClintock <msm@freescale.com>

8 files changed, 15 insertions, 15 deletions

diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index 479c513..be4f6bc 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -14,4 +14,4 @@ KERNEL_IMAGETYPE ?= "uImage"
 #               ext2.bz2 ext2.lzma \
 #               ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
 
-MACHINEOVERRIDES .= ":e500mc"
+MACHINEOVERRIDES .= ":e500mc:fslmachine"
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index 62698a9..5b7bd57 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -12,4 +12,4 @@ KERNEL_IMAGETYPE ?= "uImage"
 #               ext2.bz2 ext2.lzma \
 #               ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
 
-MACHINEOVERRIDES .= ":e500v2"
+MACHINEOVERRIDES .= ":e500v2:fslmachine"
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index 1e5d92b..d6f1d40 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -15,4 +15,4 @@ KERNEL_IMAGETYPE ?= "uImage"
 #               ext2.bz2 ext2.lzma \
 #               ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
 
-MACHINEOVERRIDES .= ":e5500-64b"
+MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index f34c2c0..5d9b70d 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -14,4 +14,4 @@ KERNEL_IMAGETYPE ?= "uImage"
 #               ext2.bz2 ext2.lzma \
 #               ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
 
-MACHINEOVERRIDES .= ":e5500"
+MACHINEOVERRIDES .= ":e5500:fslmachine"
diff --git a/recipes-devtools/binutils/binutils-fsl.inc b/recipes-devtools/binutils/binutils-fsl.inc
index 258f6cc..79366a1 100644
--- a/recipes-devtools/binutils/binutils-fsl.inc
+++ b/recipes-devtools/binutils/binutils-fsl.inc
@@ -1,4 +1,4 @@
-SRC_URI_fsl = "\
+SRC_URI_fsl_fslmachine = "\
                 ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
                 file://bin.e5500.patch \
                 file://bin.e6500-2.patch \
@@ -12,4 +12,4 @@ SRC_URI_fsl = "\
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-PR_append_fsl = "+${DISTRO}.4"
+PR_fsl_fslmachine := "${PR}+${DISTRO}.4"
diff --git a/recipes-devtools/eglibc/eglibc-fsl.inc b/recipes-devtools/eglibc/eglibc-fsl.inc
index 88876f0..4808d85 100644
--- a/recipes-devtools/eglibc/eglibc-fsl.inc
+++ b/recipes-devtools/eglibc/eglibc-fsl.inc
@@ -1,4 +1,4 @@
-SRC_URI_fsl = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
+SRC_URI_fsl_fslmachine = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
                 file://glibc.undefined_static.patch \
                 file://glibc.fixgcc4.6.patch \
                 file://glibc.readv_proto.patch \
@@ -11,4 +11,4 @@ SRC_URI_fsl = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-PR_append_fsl = "+${DISTRO}.0"
+PR_fsl_fslmachine := "${PR}+${DISTRO}.0"
diff --git a/recipes-devtools/gcc/gcc-fsl.inc b/recipes-devtools/gcc/gcc-fsl.inc
index b5ad200..629a3e5 100644
--- a/recipes-devtools/gcc/gcc-fsl.inc
+++ b/recipes-devtools/gcc/gcc-fsl.inc
@@ -4,13 +4,13 @@
 #                   file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 #                   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
 
-BINV_fsl = "4.6.2"
+BINV_fsl_fslmachine = "4.6.2"
 
-SRCREV_fsl = "180516"
+SRCREV_fsl_fslmachine = "180516"
 # ignore linaro backports since we are changing the SRCREV
-GCC-4_6-BRANCH-LINARO-BACKPORTS_fsl = ""
+GCC-4_6-BRANCH-LINARO-BACKPORTS_fsl_fslmachine = ""
 
-SRC_URI_fsl = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
+SRC_URI_fsl_fslmachine = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
            file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
            file://gcc.fix_longversionstring.patch \
            file://gcc.rm_slow_tests.patch \
@@ -43,4 +43,4 @@ SRC_URI_fsl = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-PR_append_fsl = "+${DISTRO}.4"
+PR_fsl_fslmachine := "${PR}+${DISTRO}.4"
diff --git a/recipes-devtools/gdb/gdb-fsl.inc b/recipes-devtools/gdb/gdb-fsl.inc
index ce75f91..5600238 100644
--- a/recipes-devtools/gdb/gdb-fsl.inc
+++ b/recipes-devtools/gdb/gdb-fsl.inc
@@ -1,5 +1,5 @@
-PR_append_fsl = "+${DISTRO}.0"
+PR_fsl_fslmachine := "${PR}+${DISTRO}.0"
 
-SRC_URI_append_fsl = " file://gdb-7.4.1-e500mc-disassemble-fix.patch"
+SRC_URI_fsl_fslmachine := "${SRC_URI} file://gdb-7.4.1-e500mc-disassemble-fix.patch"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"