diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-02-05 19:15:29 -0800 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-02-05 20:43:54 -0800 |
commit | c7bf6a327b9b9ebb982324c6ef9f595f7a14f94a (patch) | |
tree | 9a3170b066ee4bea9b1926b129c625714be7af63 /meta-crystalforest/recipes-kernel | |
parent | dd0bd45aa410929d0af1be63ab7397fa40148c41 (diff) | |
download | meta-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-crystalforest/recipes-kernel')
4 files changed, 0 insertions, 8 deletions
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend index 37474e30..8a8e9192 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | |||
@@ -1,7 +1,5 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | 3 | ||
6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen" | 4 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen" |
7 | KMACHINE_crystalforest-gladden = "crystalforest" | 5 | KMACHINE_crystalforest-gladden = "crystalforest" |
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend index f93bb711..51551ef4 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -1,7 +1,5 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | 3 | ||
6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" | 4 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" |
7 | KMACHINE_crystalforest-gladden = "crystalforest" | 5 | KMACHINE_crystalforest-gladden = "crystalforest" |
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend index ed9ee3c8..e4559c2f 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -1,7 +1,5 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest-gladden = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | 3 | ||
6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" | 4 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" |
7 | KMACHINE_crystalforest-gladden = "crystalforest" | 5 | KMACHINE_crystalforest-gladden = "crystalforest" |
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend index 31125178..7cdb024a 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.8.bbappend | |||
@@ -1,7 +1,5 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PACKAGE_ARCH_crystalforest = "${MACHINE_ARCH}" | ||
4 | PACKAGE_ARCH_crystalforest-server = "${MACHINE_ARCH}" | ||
5 | 3 | ||
6 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" | 4 | COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" |
7 | KMACHINE_crystalforest-gladden = "crystalforest" | 5 | KMACHINE_crystalforest-gladden = "crystalforest" |