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-fri2/recipes-kernel/linux | |
| 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-fri2/recipes-kernel/linux')
8 files changed, 0 insertions, 16 deletions
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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | COMPATIBLE_MACHINE_fri2 = "fri2" | 4 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 7 | KMACHINE_fri2 = "fri2" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | COMPATIBLE_MACHINE_fri2 = "fri2" | 4 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 7 | KMACHINE_fri2 = "fri2" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | COMPATIBLE_MACHINE_fri2 = "fri2" | 4 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 7 | KMACHINE_fri2 = "fri2" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | COMPATIBLE_MACHINE_fri2 = "fri2" | 4 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 7 | KMACHINE_fri2 = "fri2" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | COMPATIBLE_MACHINE_fri2 = "fri2" | 4 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 7 | KMACHINE_fri2 = "fri2" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | LINUX_VERSION = "3.10.19" | 4 | LINUX_VERSION = "3.10.19" |
| 7 | 5 | ||
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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | COMPATIBLE_MACHINE_fri2 = "fri2" | 4 | COMPATIBLE_MACHINE_fri2 = "fri2" |
| 7 | KMACHINE_fri2 = "fri2" | 5 | 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 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_fri2 = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_fri2-noemgd = "${MACHINE_ARCH}" | ||
| 5 | 3 | ||
| 6 | LINUX_VERSION = "3.8.13" | 4 | LINUX_VERSION = "3.8.13" |
| 7 | 5 | ||