diff options
| author | Saul Wold <sgw@linux.intel.com> | 2015-12-07 16:05:03 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2015-12-08 12:27:40 -0800 |
| commit | 6cc51b58060c18e14e5c5b331596d469b4b364af (patch) | |
| tree | e7ba1324d0d65836cdb0bbe8c544acfad4be4a76 /common/recipes-kernel | |
| parent | 1ce13b3d39b2da79916e3a175cee6baa507290f1 (diff) | |
| download | meta-intel-6cc51b58060c18e14e5c5b331596d469b4b364af.tar.gz | |
linux-yocto: Update to 4.1.13
Refactor meta-data slightly so they are sharing common information
via SRCREV_META_INTEL_COMMON, SRCREV_MACHINE_INTEL_COMMON, ...
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-kernel')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend | 34 | ||||
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 29 |
2 files changed, 37 insertions, 26 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend index a0e2ef42..c63474a6 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend | |||
| @@ -1,25 +1,31 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | LINUX_VERSION_core2-32-intel-common = "4.1.8" | 3 | LINUX_VERSION_INTEL_COMMON = "4.1.13" |
| 4 | SRCREV_META_INTEL_COMMON ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" | ||
| 5 | SRCREV_MACHINE_INTEL_COMMON ?= "44fb75fd4731d1169725ac49a305e0913440974f" | ||
| 6 | |||
| 7 | KBRANCH_INTEL_COMMON = "standard/preempt-rt/base" | ||
| 8 | |||
| 9 | LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
| 4 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 10 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
| 5 | SRCREV_meta_core2-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b" | ||
| 6 | SRCREV_machine_core2-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e" | ||
| 7 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 11 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
| 8 | KBRANCH_core2-32-intel-common = "standard/preempt-rt/base" | 12 | KBRANCH_core2-32-intel-common = "${KBRANCH_INTEL_COMMON}" |
| 13 | SRCREV_meta_core2-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
| 14 | SRCREV_machine_core2-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
| 9 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 15 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 10 | 16 | ||
| 11 | LINUX_VERSION_corei7-64-intel-common = "4.1.8" | 17 | LINUX_VERSION_corei7-64-intel-common = "${LINUX_VERSION_INTEL_COMMON}" |
| 12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 18 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 13 | SRCREV_meta_corei7-64-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b" | ||
| 14 | SRCREV_machine_corei7-64-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e" | ||
| 15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 19 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
| 16 | KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" | 20 | KBRANCH_corei7-64-intel-common = "${KBRANCH_INTEL_COMMON}" |
| 21 | SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
| 22 | SRCREV_machine_corei7-64-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
| 17 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 23 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 18 | 24 | ||
| 19 | LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8" | 25 | LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" |
| 20 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | 26 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" |
| 21 | SRCREV_meta_i586-nlp-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b" | 27 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" |
| 22 | SRCREV_machine_i586-nlp-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e" | 28 | KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}" |
| 23 | KMACHINE_i586-nlp-32-intel-common = "intel-corei7-64" | 29 | SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" |
| 24 | KBRANCH_i586-nlp-32-intel-common = "standard/preempt-rt/base" | 30 | SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" |
| 25 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 31 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" |
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index c8d24934..1d66b959 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
| @@ -1,30 +1,35 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | LINUX_VERSION_INTEL_COMMON = "4.1.13" | ||
| 4 | SRCREV_META_INTEL_COMMON = "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4" | ||
| 5 | SRCREV_MACHINE_INTEL_COMMON = "c22dc676d6d560d0b2a316283a514d65d2a510e4" | ||
| 6 | |||
| 7 | KBRANCH_INTEL_COMMON = "standard/base" | ||
| 3 | KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | 8 | KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" |
| 4 | 9 | ||
| 5 | LINUX_VERSION_core2-32-intel-common = "4.1.8" | 10 | LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" |
| 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 11 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
| 7 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 12 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
| 8 | KBRANCH_core2-32-intel-common = "standard/base" | 13 | KBRANCH_core2-32-intel-common = "${KBRANCH_INTEL_COMMON}" |
| 9 | SRCREV_meta_core2-32-intel-common ?= "cf9ab7112dd8b7fe02739a76e24ba32e87b91306" | 14 | SRCREV_meta_core2-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" |
| 10 | SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" | 15 | SRCREV_machine_core2-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" |
| 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 16 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 12 | 17 | ||
| 13 | LINUX_VERSION_corei7-64-intel-common = "4.1.8" | 18 | LINUX_VERSION_corei7-64-intel-common = "${LINUX_VERSION_INTEL_COMMON}" |
| 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 19 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
| 15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 20 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
| 16 | KBRANCH_corei7-64-intel-common = "standard/base" | 21 | KBRANCH_corei7-64-intel-common = "${KBRANCH_INTEL_COMMON}" |
| 17 | SRCREV_meta_corei7-64-intel-common ?= "cf9ab7112dd8b7fe02739a76e24ba32e87b91306" | 22 | SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}" |
| 18 | SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" | 23 | SRCREV_machine_corei7-64-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" |
| 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 24 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 20 | 25 | ||
| 21 | # Quark / X1000 BSP Info | 26 | # Quark / X1000 BSP Info |
| 22 | LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8" | 27 | LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" |
| 23 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | 28 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" |
| 24 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | 29 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" |
| 25 | KBRANCH_i586-nlp-32-intel-common = "standard/base" | 30 | KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}" |
| 26 | SRCREV_meta_i586-nlp-32-intel-common ?= "cf9ab7112dd8b7fe02739a76e24ba32e87b91306" | 31 | SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" |
| 27 | SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" | 32 | SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" |
| 28 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | 33 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" |
| 29 | 34 | ||
| 30 | 35 | ||