diff options
| author | George Nita <george.nita@enea.com> | 2015-06-26 05:11:57 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-06-26 05:11:57 +0200 |
| commit | 6098c21c68145a054bf04f8706d780007c254048 (patch) | |
| tree | 6eadbcc2d1c298a238dc10c90fde8fbef52d655f | |
| parent | 32cb2f377edf745ec0ec79d1845e6069bde8d0c8 (diff) | |
| parent | 239e7e75adc6f93334d5b0682b4ba85fb621375e (diff) | |
| download | meta-intel-6098c21c68145a054bf04f8706d780007c254048.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.19.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.19.bbappend b/common/recipes-kernel/linux/linux-yocto_3.19.bbappend index 36cec322..a0f0e341 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.19.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.19.bbappend | |||
| @@ -5,7 +5,7 @@ KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | |||
| 5 | 5 | ||
| 6 | LINUX_VERSION_core2-32-intel-common = "3.19.5" | 6 | LINUX_VERSION_core2-32-intel-common = "3.19.5" |
| 7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
| 8 | SRCREV_meta_core2-32-intel-common = "118f27167f4626fc7c71cefbec7c55a41d3a6d62" | 8 | SRCREV_meta_core2-32-intel-common = "913358acd0e27f274c96da7d699e2d18b2c9ee27" |
| 9 | SRCREV_machine_core2-32-intel-common = "e152349de59b43b2a75f2c332b44171df461d5a0" | 9 | SRCREV_machine_core2-32-intel-common = "e152349de59b43b2a75f2c332b44171df461d5a0" |
| 10 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 10 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
| 11 | KBRANCH_core2-32-intel-common = "standard/base" | 11 | KBRANCH_core2-32-intel-common = "standard/base" |
| @@ -13,7 +13,7 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
| 13 | 13 | ||
| 14 | LINUX_VERSION_corei7-64-intel-common = "3.19.5" | 14 | LINUX_VERSION_corei7-64-intel-common = "3.19.5" |
| 15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 16 | SRCREV_meta_corei7-64-intel-common = "118f27167f4626fc7c71cefbec7c55a41d3a6d62" | 16 | SRCREV_meta_corei7-64-intel-common = "913358acd0e27f274c96da7d699e2d18b2c9ee27" |
| 17 | SRCREV_machine_corei7-64-intel-common = "e152349de59b43b2a75f2c332b44171df461d5a0" | 17 | SRCREV_machine_corei7-64-intel-common = "e152349de59b43b2a75f2c332b44171df461d5a0" |
| 18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
| 19 | KBRANCH_corei7-64-intel-common = "standard/base" | 19 | KBRANCH_corei7-64-intel-common = "standard/base" |