[meta-intel] [PATCH] linux-yocto: Update to 4.1.13

[Saul Wold]

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 at linux.intel.com>
---
 .../linux/linux-yocto-rt_4.1.bbappend              | 34 +++++++++++++---------
 .../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 a0e2ef4..c63474a 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 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-LINUX_VERSION_core2-32-intel-common = "4.1.8"
+LINUX_VERSION_INTEL_COMMON = "4.1.13"
+SRCREV_META_INTEL_COMMON ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4"
+SRCREV_MACHINE_INTEL_COMMON ?= "44fb75fd4731d1169725ac49a305e0913440974f"
+
+KBRANCH_INTEL_COMMON = "standard/preempt-rt/base"
+
+LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-SRCREV_meta_core2-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
-SRCREV_machine_core2-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
-KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
+KBRANCH_core2-32-intel-common = "${KBRANCH_INTEL_COMMON}"
+SRCREV_meta_core2-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
+SRCREV_machine_core2-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_corei7-64-intel-common = "4.1.8"
+LINUX_VERSION_corei7-64-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-SRCREV_meta_corei7-64-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
-SRCREV_machine_corei7-64-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
+KBRANCH_corei7-64-intel-common = "${KBRANCH_INTEL_COMMON}"
+SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
+SRCREV_machine_corei7-64-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8"
+LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
 COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-SRCREV_meta_i586-nlp-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
-SRCREV_machine_i586-nlp-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
-KMACHINE_i586-nlp-32-intel-common = "intel-corei7-64"
-KBRANCH_i586-nlp-32-intel-common = "standard/preempt-rt/base"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KMACHINE_i586-nlp-32-intel-common = "intel-quark"
+KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}"
+SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
+SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
+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 c8d2493..1d66b95 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 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+LINUX_VERSION_INTEL_COMMON = "4.1.13"
+SRCREV_META_INTEL_COMMON = "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4"
+SRCREV_MACHINE_INTEL_COMMON = "c22dc676d6d560d0b2a316283a514d65d2a510e4"
+
+KBRANCH_INTEL_COMMON = "standard/base"
 KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
 
-LINUX_VERSION_core2-32-intel-common = "4.1.8"
+LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
-KBRANCH_core2-32-intel-common = "standard/base"
-SRCREV_meta_core2-32-intel-common ?= "cf9ab7112dd8b7fe02739a76e24ba32e87b91306"
-SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+KBRANCH_core2-32-intel-common = "${KBRANCH_INTEL_COMMON}"
+SRCREV_meta_core2-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
+SRCREV_machine_core2-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_corei7-64-intel-common = "4.1.8"
+LINUX_VERSION_corei7-64-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KBRANCH_corei7-64-intel-common = "standard/base"
-SRCREV_meta_corei7-64-intel-common ?= "cf9ab7112dd8b7fe02739a76e24ba32e87b91306"
-SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+KBRANCH_corei7-64-intel-common = "${KBRANCH_INTEL_COMMON}"
+SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
+SRCREV_machine_corei7-64-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
 # Quark / X1000 BSP Info
-LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8"
+LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
 COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
 KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-KBRANCH_i586-nlp-32-intel-common = "standard/base"
-SRCREV_meta_i586-nlp-32-intel-common ?= "cf9ab7112dd8b7fe02739a76e24ba32e87b91306"
-SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}"
+SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
+SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
 KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
 
 
-- 
2.5.0