From c7bf6a327b9b9ebb982324c6ef9f595f7a14f94a Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 5 Feb 2014 19:15:29 -0800 Subject: 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 Cc: Richard Purdie --- meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend | 1 - meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 1 - meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend | 1 - meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | 1 - meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend | 1 - meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend | 1 - 6 files changed, 6 deletions(-) (limited to 'meta-sugarbay') diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend index f2b3cf4f..f09fbf60 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend index 68e1c488..531a3ad5 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend @@ -1,5 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" KMACHINE_sugarbay = "sugarbay" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend index 68e1c488..531a3ad5 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend @@ -1,5 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" KMACHINE_sugarbay = "sugarbay" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend index e0bf22c4..8811fca5 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend index 4fe66f80..bf047352 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend index 15966948..1cdce2f6 100644 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_sugarbay = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_sugarbay = "sugarbay" -- cgit v1.2.3-54-g00ecf