diff options
| author | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
|---|---|---|
| committer | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
| commit | 6ef83e1cb65080174a888faef3a0791158f10ee4 (patch) | |
| tree | 6b028d3ab33c369284f41614d1c14aef8994c2cc /common | |
| parent | accc04b57bb68da4542bcecd49d95dcb03efd909 (diff) | |
| parent | 185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff) | |
| download | meta-intel-6ef83e1cb65080174a888faef3a0791158f10ee4.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Conflicts:
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
Diffstat (limited to 'common')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 8843e085..902f987e 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
| @@ -2,18 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
| 2 | 2 | ||
| 3 | KERNEL_FEATURES_INTEL_COMMON = "" | 3 | KERNEL_FEATURES_INTEL_COMMON = "" |
| 4 | 4 | ||
| 5 | LINUX_VERSION_core2-32-intel-common = "3.10.33" | 5 | LINUX_VERSION_core2-32-intel-common = "3.10.34" |
| 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
| 7 | SRCREV_meta_core2-32-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" | 7 | SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 8 | SRCREV_machine_core2-32-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" | 8 | SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 9 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 9 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
| 10 | KBRANCH_core2-32-intel-common = "standard/base" | 10 | KBRANCH_core2-32-intel-common = "standard/base" |
| 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 12 | 12 | ||
| 13 | LINUX_VERSION_corei7-64-intel-common = "3.10.33" | 13 | LINUX_VERSION_corei7-64-intel-common = "3.10.34" |
| 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 15 | SRCREV_meta_corei7-64-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" | 15 | SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
| 16 | SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" | 16 | SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
| 17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" |
| 18 | KBRANCH_intel-corei7-64-intel-common = "standard/base" | 18 | KBRANCH_intel-corei7-64-intel-common = "standard/base" |
| 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |