summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@enea.com>2014-04-03 07:58:55 (GMT)
committerMaxin B. John <maxin.john@enea.com>2014-04-03 07:58:55 (GMT)
commit6ef83e1cb65080174a888faef3a0791158f10ee4 (patch)
tree6b028d3ab33c369284f41614d1c14aef8994c2cc
parentaccc04b57bb68da4542bcecd49d95dcb03efd909 (diff)
parent185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff)
downloadmeta-intel-6ef83e1cb65080174a888faef3a0791158f10ee4.tar.gz
Merge remote-tracking branch 'origin/master' into master-enea
Conflicts: common/recipes-kernel/linux/linux-yocto_3.10.bbappend
-rw-r--r--common/recipes-kernel/linux/linux-yocto_3.10.bbappend12
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend10
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend12
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend10
-rw-r--r--meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend8
5 files changed, 26 insertions, 26 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 8843e08..902f987 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
3KERNEL_FEATURES_INTEL_COMMON = "" 3KERNEL_FEATURES_INTEL_COMMON = ""
4 4
5LINUX_VERSION_core2-32-intel-common = "3.10.33" 5LINUX_VERSION_core2-32-intel-common = "3.10.34"
6COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 6COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
7SRCREV_meta_core2-32-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" 7SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4"
8SRCREV_machine_core2-32-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" 8SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09"
9KMACHINE_core2-32-intel-common = "intel-core2-32" 9KMACHINE_core2-32-intel-common = "intel-core2-32"
10KBRANCH_core2-32-intel-common = "standard/base" 10KBRANCH_core2-32-intel-common = "standard/base"
11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
12 12
13LINUX_VERSION_corei7-64-intel-common = "3.10.33" 13LINUX_VERSION_corei7-64-intel-common = "3.10.34"
14COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 14COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
15SRCREV_meta_corei7-64-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" 15SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4"
16SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" 16SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09"
17KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" 17KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64"
18KBRANCH_intel-corei7-64-intel-common = "standard/base" 18KBRANCH_intel-corei7-64-intel-common = "standard/base"
19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 19KERNEL_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 37cf96e..1b7ff84 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"
11KBRANCH_crownbay-noemgd = "standard/crownbay" 11KBRANCH_crownbay-noemgd = "standard/crownbay"
12KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" 12KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
13 13
14LINUX_VERSION = "3.10.32" 14LINUX_VERSION = "3.10.34"
15 15
16SRCREV_meta_crownbay = "6e0e756d51372c8b176c5d1e6f786545bceed351" 16SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4"
17SRCREV_machine_crownbay = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" 17SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09"
18SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 18SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
19 19
20SRCREV_meta_crownbay-noemgd = "6e0e756d51372c8b176c5d1e6f786545bceed351" 20SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
21SRCREV_machine_crownbay-noemgd = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" 21SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09"
22 22
23SRC_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" 23SRC_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 6075783..3bf0182 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"
11KBRANCH_emenlow-noemgd = "standard/emenlow" 11KBRANCH_emenlow-noemgd = "standard/emenlow"
12KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" 12KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
13 13
14LINUX_VERSION = "3.10.19" 14LINUX_VERSION = "3.10.25"
15 15
16SRCREV_meta_emenlow = "d9cd83c0292bd4e2a6754a96761027252e726a42" 16SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4"
17SRCREV_machine_emenlow = "a9ec82e355130160f9094e670bd5be0022a84194" 17SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f"
18SRCREV_emgd_emenlow = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" 18SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
19 19
20SRCREV_meta_emenlow-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" 20SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
21SRCREV_machine_emenlow-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" 21SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f"
22 22
23SRC_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" 23SRC_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 4b81b61..07eaa2a 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,13 +1,13 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION = "3.10.33" 3LINUX_VERSION = "3.10.34"
4 4
5COMPATIBLE_MACHINE_fri2 = "fri2" 5COMPATIBLE_MACHINE_fri2 = "fri2"
6KMACHINE_fri2 = "fri2" 6KMACHINE_fri2 = "fri2"
7KBRANCH_fri2 = "standard/fri2" 7KBRANCH_fri2 = "standard/fri2"
8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
9SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40" 9SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4"
10SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7" 10SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09"
11SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 11SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
12SRC_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" 12SRC_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"
13 13
@@ -15,8 +15,8 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
15KMACHINE_fri2-noemgd = "fri2" 15KMACHINE_fri2-noemgd = "fri2"
16KBRANCH_fri2-noemgd = "standard/fri2" 16KBRANCH_fri2-noemgd = "standard/fri2"
17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
18SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40" 18SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
19SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7" 19SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09"
20 20
21module_autoload_iwlwifi = "iwlwifi" 21module_autoload_iwlwifi = "iwlwifi"
22 22
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
index ec67460..50f8561 100644
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -3,13 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3 3
4COMPATIBLE_MACHINE_nuc = "nuc" 4COMPATIBLE_MACHINE_nuc = "nuc"
5KMACHINE_nuc = "chiefriver" 5KMACHINE_nuc = "chiefriver"
6KBRANCH_nuc = "standard/common-pc-64/chiefriver" 6KBRANCH_nuc = "standard/base"
7 7
8KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" 8KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi"
9 9
10LINUX_VERSION = "3.10.19" 10LINUX_VERSION = "3.10.34"
11 11
12SRCREV_meta_nuc = "d9cd83c0292bd4e2a6754a96761027252e726a42" 12SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4"
13SRCREV_machine_nuc = "a9ec82e355130160f9094e670bd5be0022a84194" 13SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09"
14 14
15module_autoload_iwlwifi_nuc = "iwlwifi" 15module_autoload_iwlwifi_nuc = "iwlwifi"