summaryrefslogtreecommitdiffstats
path: root/meta-crownbay
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2014-02-06 03:15:29 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2014-02-06 04:43:54 (GMT)
commitc7bf6a327b9b9ebb982324c6ef9f595f7a14f94a (patch)
tree9a3170b066ee4bea9b1926b129c625714be7af63 /meta-crownbay
parentdd0bd45aa410929d0af1be63ab7397fa40148c41 (diff)
downloadmeta-intel-c7bf6a327b9b9ebb982324c6ef9f595f7a14f94a.tar.gz
intel-common: Make using intel-common override opt-in
Currently the intel-core*-common.inc files also include the intel-common-pkgarch.inc, forcing the introduction of the intel-common PACKAGE_ARCH. Coupling this with the addition of the intel-common MACHINE_OVERRIDE, means that even MACHINE_ARCH packages can be influenced by intel-common overrides, which is not desirable. Remove the intel-common-pkgarch.inc from the intel-core*common.inc include files, requiring BSPs wanting to use the intel-common mechanism to explicitly include it. This obviates the need to reset the linux-yocto PACKAGE_ARCH to MACHINE_ARCH. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-crownbay')
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend1
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend2
7 files changed, 0 insertions, 13 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
index db6e699..a1fccfb 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
4PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
5 3
6COMPATIBLE_MACHINE_crownbay = "crownbay" 4COMPATIBLE_MACHINE_crownbay = "crownbay"
7KMACHINE_crownbay = "crownbay" 5KMACHINE_crownbay = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index ef88394..7b9b762 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -1,6 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
4 3
5COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 4COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
6KMACHINE_crownbay-noemgd = "crownbay" 5KMACHINE_crownbay-noemgd = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 1e86e0c..649e519 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
4PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
5 3
6COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 4COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
7KMACHINE_crownbay-noemgd = "crownbay" 5KMACHINE_crownbay-noemgd = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
index 1e86e0c..649e519 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
4PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
5 3
6COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 4COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
7KMACHINE_crownbay-noemgd = "crownbay" 5KMACHINE_crownbay-noemgd = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 1a1c1fb..06021c9 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
4PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
5 3
6COMPATIBLE_MACHINE_crownbay = "crownbay" 4COMPATIBLE_MACHINE_crownbay = "crownbay"
7KMACHINE_crownbay = "crownbay" 5KMACHINE_crownbay = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 86ef95f..375a6ff 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
4PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
5 3
6COMPATIBLE_MACHINE_crownbay = "crownbay" 4COMPATIBLE_MACHINE_crownbay = "crownbay"
7KMACHINE_crownbay = "crownbay" 5KMACHINE_crownbay = "crownbay"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 9bb8b90..9be86d2 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}"
4PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}"
5 3
6COMPATIBLE_MACHINE_crownbay = "crownbay" 4COMPATIBLE_MACHINE_crownbay = "crownbay"
7KMACHINE_crownbay = "crownbay" 5KMACHINE_crownbay = "crownbay"