diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-01-24 13:28:33 -0800 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-01-27 16:56:14 -0800 |
| commit | 587ac72206cadf36594a911a71251089901a3f0d (patch) | |
| tree | 18ae469156afe5fd1d6b0a0208ecae3c5e2c6b0f /meta-crownbay | |
| parent | c4fc0c595845ec274881383c4522df39339adbc6 (diff) | |
| download | meta-intel-587ac72206cadf36594a911a71251089901a3f0d.tar.gz | |
crownbay: Set PACKAGE_ARCH to MACHINE_ARCH explicitly
The new intel-common.inc sets the default of the PACKAGE_ARCH for the
linux-yocto kernel recipes to DEFAULTTUNE_kernel. Revert the existing
recipes to MACHINE_ARCH until they can be removed in favor of a more
unified mechanism.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-crownbay')
7 files changed, 20 insertions, 0 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend index 8bc18e45..db6e699c 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 6 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
| 4 | KMACHINE_crownbay = "crownbay" | 7 | KMACHINE_crownbay = "crownbay" |
| 5 | KBRANCH_crownbay = "standard/crownbay" | 8 | KBRANCH_crownbay = "standard/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 5c24dcf3..ef883940 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,5 +1,7 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 4 | |||
| 3 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 5 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
| 4 | KMACHINE_crownbay-noemgd = "crownbay" | 6 | KMACHINE_crownbay-noemgd = "crownbay" |
| 5 | 7 | ||
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 20490766..1e86e0c4 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,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 6 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
| 4 | KMACHINE_crownbay-noemgd = "crownbay" | 7 | KMACHINE_crownbay-noemgd = "crownbay" |
| 5 | 8 | ||
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 20490766..1e86e0c4 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,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | 6 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" |
| 4 | KMACHINE_crownbay-noemgd = "crownbay" | 7 | KMACHINE_crownbay-noemgd = "crownbay" |
| 5 | 8 | ||
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 9b6a8346..1a1c1fb0 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 6 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
| 4 | KMACHINE_crownbay = "crownbay" | 7 | KMACHINE_crownbay = "crownbay" |
| 5 | KBRANCH_crownbay = "standard/crownbay" | 8 | KBRANCH_crownbay = "standard/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 1f264b84..86ef95f9 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 6 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
| 4 | KMACHINE_crownbay = "crownbay" | 7 | KMACHINE_crownbay = "crownbay" |
| 5 | KBRANCH_crownbay = "standard/crownbay" | 8 | KBRANCH_crownbay = "standard/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 da86035f..9bb8b90f 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PACKAGE_ARCH_crownbay = "${MACHINE_ARCH}" | ||
| 4 | PACKAGE_ARCH_crownbay-noemgd = "${MACHINE_ARCH}" | ||
| 5 | |||
| 3 | COMPATIBLE_MACHINE_crownbay = "crownbay" | 6 | COMPATIBLE_MACHINE_crownbay = "crownbay" |
| 4 | KMACHINE_crownbay = "crownbay" | 7 | KMACHINE_crownbay = "crownbay" |
| 5 | KBRANCH_crownbay = "standard/crownbay" | 8 | KBRANCH_crownbay = "standard/crownbay" |