Merge remote-tracking branch 'origin/daisy' into daisy-eneaenea-linux-4.0-rt-test1 enea-linux-4.0-rc3 enea-linux-4.0 daisy-enea-man daisy-enea

author: George Nita <george.nita@enea.com> 2014-05-06 03:26:24 (GMT)
committer: George Nita <george.nita@enea.com> 2014-05-06 03:26:24 (GMT)
commit: 5d98064044ef8588ad7c884c8f0feb34e8bdbb9d (patch)
tree: ee5a6d18181e192b9089f189561ccd134410897e
parent: 5d093e6f841cc82f072fd1b19573628392ca640a (diff)
parent: d8e9e84375949ea82dadf214a04e94a2f871f5ce (diff)
download: meta-intel-daisy-enea.tar.gz
4 files changed, 24 insertions, 24 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 1ab0a35..003d835 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}:"
 KERNEL_FEATURES_INTEL_COMMON = ""
-LINUX_VERSION_core2-32-intel-common = "3.10.35"
+LINUX_VERSION_core2-32-intel-common = "3.10.38"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-SRCREV_meta_core2-32-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_core2-32-intel-common = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_core2-32-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_core2-32-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KBRANCH_core2-32-intel-common = "standard/base"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-LINUX_VERSION_corei7-64-intel-common = "3.10.35"
+LINUX_VERSION_corei7-64-intel-common = "3.10.38"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_corei7-64-intel-common = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_corei7-64-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 15d8b89..f5479c0 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,13 +11,13 @@ KMACHINE_crownbay-noemgd = "crownbay"
 KBRANCH_crownbay-noemgd = "standard/crownbay"
 KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
-LINUX_VERSION_crownbay = "3.10.35"
+LINUX_VERSION_crownbay = "3.10.38"
-SRCREV_meta_crownbay = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_crownbay = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_crownbay = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_crownbay = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
-LINUX_VERSION_crownbay-noemgd = "3.10.35"
+LINUX_VERSION_crownbay-noemgd = "3.10.38"
-SRCREV_meta_crownbay-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_crownbay-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_crownbay-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_crownbay-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
index dae9c90..e4fc86c 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,13 +11,13 @@ KMACHINE_emenlow-noemgd = "emenlow"
 KBRANCH_emenlow-noemgd = "standard/emenlow"
 KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
-LINUX_VERSION_emenlow = "3.10.35"
+LINUX_VERSION_emenlow = "3.10.38"
-SRCREV_meta_emenlow = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_emenlow = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_emenlow = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_emenlow = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
-LINUX_VERSION_emenlow-noemgd = "3.10.35"
+LINUX_VERSION_emenlow-noemgd = "3.10.38"
-SRCREV_meta_emenlow-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_emenlow-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_emenlow-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_emenlow-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
index c1be243..8c442ab 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -4,9 +4,9 @@ COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/fri2"
 KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
-LINUX_VERSION_fri2 = "3.10.35"
+LINUX_VERSION_fri2 = "3.10.38"
-SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_fri2 = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_fri2 = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
 SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
@@ -14,9 +14,9 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
 KMACHINE_fri2-noemgd = "fri2"
 KBRANCH_fri2-noemgd = "standard/fri2"
 KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
-LINUX_VERSION_fri2-noemgd = "3.10.35"
+LINUX_VERSION_fri2-noemgd = "3.10.38"
-SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_meta_fri2-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
-SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 module_autoload_iwlwifi = "iwlwifi"
author	George Nita <george.nita@enea.com>	2014-05-06 03:26:24 (GMT)
committer	George Nita <george.nita@enea.com>	2014-05-06 03:26:24 (GMT)
commit	5d98064044ef8588ad7c884c8f0feb34e8bdbb9d (patch)
tree	ee5a6d18181e192b9089f189561ccd134410897e
parent	5d093e6f841cc82f072fd1b19573628392ca640a (diff)
parent	d8e9e84375949ea82dadf214a04e94a2f871f5ce (diff)
download	meta-intel-daisy-enea.tar.gz

diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 1ab0a35..003d835 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.35"	5	LINUX_VERSION_core2-32-intel-common = "3.10.38"
6	COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"	6	COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
7	SRCREV_meta_core2-32-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	7	SRCREV_meta_core2-32-intel-common = "1eb79862c2959cfa305773e7f785d6d1810bf190"
8	SRCREV_machine_core2-32-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	8	SRCREV_machine_core2-32-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388"
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.35"	13	LINUX_VERSION_corei7-64-intel-common = "3.10.38"
14	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"	14	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
15	SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	15	SRCREV_meta_corei7-64-intel-common = "1eb79862c2959cfa305773e7f785d6d1810bf190"
16	SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	16	SRCREV_machine_corei7-64-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388"
17	KMACHINE_corei7-64-intel-common = "intel-corei7-64"	17	KMACHINE_corei7-64-intel-common = "intel-corei7-64"
18	KBRANCH_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}"


diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend index 15d8b89..f5479c0 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,13 +11,13 @@ KMACHINE_crownbay-noemgd = "crownbay"
11	KBRANCH_crownbay-noemgd = "standard/crownbay"	11	KBRANCH_crownbay-noemgd = "standard/crownbay"
12	KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"	12	KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
13		13
14	LINUX_VERSION_crownbay = "3.10.35"	14	LINUX_VERSION_crownbay = "3.10.38"
15	SRCREV_meta_crownbay = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	15	SRCREV_meta_crownbay = "1eb79862c2959cfa305773e7f785d6d1810bf190"
16	SRCREV_machine_crownbay = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	16	SRCREV_machine_crownbay = "02f7e63e56c061617957388c23bd5cf9b05c5388"
17	SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"	17	SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
18		18
19	LINUX_VERSION_crownbay-noemgd = "3.10.35"	19	LINUX_VERSION_crownbay-noemgd = "3.10.38"
20	SRCREV_meta_crownbay-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	20	SRCREV_meta_crownbay-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
21	SRCREV_machine_crownbay-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	21	SRCREV_machine_crownbay-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
22		22
23	SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"	23	SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"


diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend index dae9c90..e4fc86c 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,13 +11,13 @@ KMACHINE_emenlow-noemgd = "emenlow"
11	KBRANCH_emenlow-noemgd = "standard/emenlow"	11	KBRANCH_emenlow-noemgd = "standard/emenlow"
12	KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"	12	KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
13		13
14	LINUX_VERSION_emenlow = "3.10.35"	14	LINUX_VERSION_emenlow = "3.10.38"
15	SRCREV_meta_emenlow = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	15	SRCREV_meta_emenlow = "1eb79862c2959cfa305773e7f785d6d1810bf190"
16	SRCREV_machine_emenlow = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	16	SRCREV_machine_emenlow = "02f7e63e56c061617957388c23bd5cf9b05c5388"
17	SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"	17	SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
18		18
19	LINUX_VERSION_emenlow-noemgd = "3.10.35"	19	LINUX_VERSION_emenlow-noemgd = "3.10.38"
20	SRCREV_meta_emenlow-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	20	SRCREV_meta_emenlow-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
21	SRCREV_machine_emenlow-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	21	SRCREV_machine_emenlow-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
22		22
23	SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"	23	SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"


diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index c1be243..8c442ab 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -4,9 +4,9 @@ COMPATIBLE_MACHINE_fri2 = "fri2"
4	KMACHINE_fri2 = "fri2"	4	KMACHINE_fri2 = "fri2"
5	KBRANCH_fri2 = "standard/fri2"	5	KBRANCH_fri2 = "standard/fri2"
6	KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"	6	KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
7	LINUX_VERSION_fri2 = "3.10.35"	7	LINUX_VERSION_fri2 = "3.10.38"
8	SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	8	SRCREV_meta_fri2 = "1eb79862c2959cfa305773e7f785d6d1810bf190"
9	SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	9	SRCREV_machine_fri2 = "02f7e63e56c061617957388c23bd5cf9b05c5388"
10	SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"	10	SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
11	SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"	11	SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
12		12
@@ -14,9 +14,9 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
14	KMACHINE_fri2-noemgd = "fri2"	14	KMACHINE_fri2-noemgd = "fri2"
15	KBRANCH_fri2-noemgd = "standard/fri2"	15	KBRANCH_fri2-noemgd = "standard/fri2"
16	KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"	16	KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
17	LINUX_VERSION_fri2-noemgd = "3.10.35"	17	LINUX_VERSION_fri2-noemgd = "3.10.38"
18	SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"	18	SRCREV_meta_fri2-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
19	SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"	19	SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
20		20
21	module_autoload_iwlwifi = "iwlwifi"	21	module_autoload_iwlwifi = "iwlwifi"
22		22