diff options
| author | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
| commit | fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc (patch) | |
| tree | 1a22b4521591d980819dcd0d90b7964f8d6b1a32 /common/recipes-kernel/linux/linux-yocto_3.10.bbappend | |
| parent | 6ef83e1cb65080174a888faef3a0791158f10ee4 (diff) | |
| parent | b26946e8e7f1f3bb68625731b493156309449f5d (diff) | |
| download | meta-intel-fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto_3.10.bbappend')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 902f987e..1ab0a356 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.34" | 5 | LINUX_VERSION_core2-32-intel-common = "3.10.35" |
| 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
| 7 | SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 7 | SRCREV_meta_core2-32-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
| 8 | SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 8 | SRCREV_machine_core2-32-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
| 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.34" | 13 | LINUX_VERSION_corei7-64-intel-common = "3.10.35" |
| 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 15 | SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 15 | SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
| 16 | SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 16 | SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
| 17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
| 18 | KBRANCH_intel-corei7-64-intel-common = "standard/base" | 18 | KBRANCH_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}" |