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-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 2 -- meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend | 2 -- 8 files changed, 16 deletions(-) (limited to 'meta-fri2') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend index 103f2a72..52605615 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend index 88697ff2..5bab3e9b 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend index 442de5f4..875bf8a5 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.8.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend index bdca9285..2afea0b9 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend index a4c2838b..b4d2dfd6 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.8.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index b4909b2e..56f2eed8 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" LINUX_VERSION = "3.10.19" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend index 11105690..f909c82c 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend index 7703d068..54e8a65f 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" -PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" LINUX_VERSION = "3.8.13" -- cgit v1.2.3-54-g00ecf