Merge remote-tracking branch 'origin/master' into master-eneamaster-enea

author: George Nita <george.nita@enea.com> 2015-10-27 05:12:03 +0100
committer: George Nita <george.nita@enea.com> 2015-10-27 05:12:03 +0100
commit: 9a481280c62bccc7df442ffcc1f69badacb04251 (patch)
tree: b033100d5abb09b3a36872771e04523dafbc7a8e
parent: 57c61fd48b417e790b2e65f359f2de370eb42310 (diff)
parent: 42cd81d2058e957b0dd223f6017687e134f6c21f (diff)
download: meta-intel-master-enea.tar.gz
3 files changed, 9 insertions, 9 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 104da29d..cf45c616 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
@@ -2,16 +2,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 LINUX_VERSION_core2-32-intel-common = "4.1.8"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-SRCREV_meta_core2-32-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta_core2-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
-SRCREV_machine_core2-32-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"
+SRCREV_machine_core2-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 LINUX_VERSION_corei7-64-intel-common = "4.1.8"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-SRCREV_meta_corei7-64-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta_corei7-64-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
-SRCREV_machine_corei7-64-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"
+SRCREV_machine_corei7-64-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index ce97f1cc..d2a1c3c8 100644
--- a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 #LINUX_VERSION_i586-nlp-32-intel-common = "4.1.2"
 COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-SRCREV_meta_i586-nlp-32-intel-common = "429f9e2ff0649b8c9341345622545d874d5e303a"
+SRCREV_meta-nlp-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
-SRCREV_machine_i586-nlp-32-intel-common = "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"
+SRCREV_machine-nlp-32-intel-common = "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 KBRANCH_i586-nlp-32-intel-common = "standard/tiny/common-pc"
 KMACHINE_i586-nlp-32-intel-common = "intel-quark"
 KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_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 6c3d784e..75adf920 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -6,7 +6,7 @@ LINUX_VERSION_core2-32-intel-common = "4.1.8"
 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 ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta_core2-32-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
 SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
@@ -14,7 +14,7 @@ LINUX_VERSION_corei7-64-intel-common = "4.1.8"
 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 ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta_corei7-64-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
 SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
@@ -23,7 +23,7 @@ LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8"
 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 ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta_i586-nlp-32-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
 SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
author	George Nita <george.nita@enea.com>	2015-10-27 05:12:03 +0100
committer	George Nita <george.nita@enea.com>	2015-10-27 05:12:03 +0100
commit	9a481280c62bccc7df442ffcc1f69badacb04251 (patch)
tree	b033100d5abb09b3a36872771e04523dafbc7a8e
parent	57c61fd48b417e790b2e65f359f2de370eb42310 (diff)
parent	42cd81d2058e957b0dd223f6017687e134f6c21f (diff)
download	meta-intel-master-enea.tar.gz

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 104da29d..cf45c616 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
@@ -2,16 +2,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2		2
3	LINUX_VERSION_core2-32-intel-common = "4.1.8"	3	LINUX_VERSION_core2-32-intel-common = "4.1.8"
4	COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"	4	COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
5	SRCREV_meta_core2-32-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"	5	SRCREV_meta_core2-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
6	SRCREV_machine_core2-32-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"	6	SRCREV_machine_core2-32-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
7	KMACHINE_core2-32-intel-common = "intel-core2-32"	7	KMACHINE_core2-32-intel-common = "intel-core2-32"
8	KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"	8	KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
9	KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"	9	KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
10		10
11	LINUX_VERSION_corei7-64-intel-common = "4.1.8"	11	LINUX_VERSION_corei7-64-intel-common = "4.1.8"
12	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"	12	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
13	SRCREV_meta_corei7-64-intel-common = "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"	13	SRCREV_meta_corei7-64-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
14	SRCREV_machine_corei7-64-intel-common = "29257e529f968d17a5238624f27ddc76f759dc9d"	14	SRCREV_machine_corei7-64-intel-common = "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
15	KMACHINE_corei7-64-intel-common = "intel-corei7-64"	15	KMACHINE_corei7-64-intel-common = "intel-corei7-64"
16	KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"	16	KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
17	KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"	17	KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"


diff --git a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index ce97f1cc..d2a1c3c8 100644 --- a/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2		2
3	#LINUX_VERSION_i586-nlp-32-intel-common = "4.1.2"	3	#LINUX_VERSION_i586-nlp-32-intel-common = "4.1.2"
4	COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"	4	COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
5	SRCREV_meta_i586-nlp-32-intel-common = "429f9e2ff0649b8c9341345622545d874d5e303a"	5	SRCREV_meta-nlp-32-intel-common = "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
6	SRCREV_machine_i586-nlp-32-intel-common = "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e"	6	SRCREV_machine-nlp-32-intel-common = "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
7	KBRANCH_i586-nlp-32-intel-common = "standard/tiny/common-pc"	7	KBRANCH_i586-nlp-32-intel-common = "standard/tiny/common-pc"
8	KMACHINE_i586-nlp-32-intel-common = "intel-quark"	8	KMACHINE_i586-nlp-32-intel-common = "intel-quark"
9	KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"	9	KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_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 6c3d784e..75adf920 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -6,7 +6,7 @@ LINUX_VERSION_core2-32-intel-common = "4.1.8"
6	COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"	6	COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
7	KMACHINE_core2-32-intel-common = "intel-core2-32"	7	KMACHINE_core2-32-intel-common = "intel-core2-32"
8	KBRANCH_core2-32-intel-common = "standard/base"	8	KBRANCH_core2-32-intel-common = "standard/base"
9	SRCREV_meta_core2-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"	9	SRCREV_meta_core2-32-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
10	SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"	10	SRCREV_machine_core2-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
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
@@ -14,7 +14,7 @@ LINUX_VERSION_corei7-64-intel-common = "4.1.8"
14	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"	14	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
15	KMACHINE_corei7-64-intel-common = "intel-corei7-64"	15	KMACHINE_corei7-64-intel-common = "intel-corei7-64"
16	KBRANCH_corei7-64-intel-common = "standard/base"	16	KBRANCH_corei7-64-intel-common = "standard/base"
17	SRCREV_meta_corei7-64-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"	17	SRCREV_meta_corei7-64-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
18	SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"	18	SRCREV_machine_corei7-64-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
19	KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"	19	KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
20		20
@@ -23,7 +23,7 @@ LINUX_VERSION_i586-nlp-32-intel-common = "4.1.8"
23	COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"	23	COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
24	KMACHINE_i586-nlp-32-intel-common = "intel-quark"	24	KMACHINE_i586-nlp-32-intel-common = "intel-quark"
25	KBRANCH_i586-nlp-32-intel-common = "standard/base"	25	KBRANCH_i586-nlp-32-intel-common = "standard/base"
26	SRCREV_meta_i586-nlp-32-intel-common ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"	26	SRCREV_meta_i586-nlp-32-intel-common ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
27	SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"	27	SRCREV_machine_i586-nlp-32-intel-common ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
28	KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""	28	KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
29		29