diff options
author | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
---|---|---|
committer | Maxin B. John <maxin.john@enea.com> | 2014-04-03 09:58:55 +0200 |
commit | 6ef83e1cb65080174a888faef3a0791158f10ee4 (patch) | |
tree | 6b028d3ab33c369284f41614d1c14aef8994c2cc | |
parent | accc04b57bb68da4542bcecd49d95dcb03efd909 (diff) | |
parent | 185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff) | |
download | meta-intel-6ef83e1cb65080174a888faef3a0791158f10ee4.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Conflicts:
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
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 8843e085..902f987e 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.33" | 5 | LINUX_VERSION_core2-32-intel-common = "3.10.34" |
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
7 | SRCREV_meta_core2-32-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" | 7 | SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
8 | SRCREV_machine_core2-32-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" | 8 | SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
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.33" | 13 | LINUX_VERSION_corei7-64-intel-common = "3.10.34" |
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | SRCREV_meta_corei7-64-intel-common = "99c503a92885060bebf2bba6747735e8e9346a40" | 15 | SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
16 | SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de7" | 16 | SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_intel-corei7-64-intel-common = "standard/base" | 18 | KBRANCH_intel-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 37cf96e5..1b7ff84c 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 = "3.10.32" | 14 | LINUX_VERSION = "3.10.34" |
15 | 15 | ||
16 | SRCREV_meta_crownbay = "6e0e756d51372c8b176c5d1e6f786545bceed351" | 16 | SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
17 | SRCREV_machine_crownbay = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" | 17 | SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
18 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 18 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
19 | 19 | ||
20 | SRCREV_meta_crownbay-noemgd = "6e0e756d51372c8b176c5d1e6f786545bceed351" | 20 | SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
21 | SRCREV_machine_crownbay-noemgd = "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718" | 21 | SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
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 60757838..3bf0182b 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 = "3.10.19" | 14 | LINUX_VERSION = "3.10.25" |
15 | 15 | ||
16 | SRCREV_meta_emenlow = "d9cd83c0292bd4e2a6754a96761027252e726a42" | 16 | SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
17 | SRCREV_machine_emenlow = "a9ec82e355130160f9094e670bd5be0022a84194" | 17 | SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f" |
18 | SRCREV_emgd_emenlow = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf" | 18 | SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
19 | 19 | ||
20 | SRCREV_meta_emenlow-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42" | 20 | SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
21 | SRCREV_machine_emenlow-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194" | 21 | SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f" |
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 4b81b610..07eaa2a4 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | LINUX_VERSION = "3.10.33" | 3 | LINUX_VERSION = "3.10.34" |
4 | 4 | ||
5 | COMPATIBLE_MACHINE_fri2 = "fri2" | 5 | COMPATIBLE_MACHINE_fri2 = "fri2" |
6 | KMACHINE_fri2 = "fri2" | 6 | KMACHINE_fri2 = "fri2" |
7 | KBRANCH_fri2 = "standard/fri2" | 7 | KBRANCH_fri2 = "standard/fri2" |
8 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | 8 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" |
9 | SRCREV_meta_fri2 = "99c503a92885060bebf2bba6747735e8e9346a40" | 9 | SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
10 | SRCREV_machine_fri2 = "21df0c8486e129a4087970a07b423c533ae05de7" | 10 | SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
11 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 11 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
12 | 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 | 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" |
13 | 13 | ||
@@ -15,8 +15,8 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | |||
15 | KMACHINE_fri2-noemgd = "fri2" | 15 | KMACHINE_fri2-noemgd = "fri2" |
16 | KBRANCH_fri2-noemgd = "standard/fri2" | 16 | KBRANCH_fri2-noemgd = "standard/fri2" |
17 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | 17 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
18 | SRCREV_meta_fri2-noemgd = "99c503a92885060bebf2bba6747735e8e9346a40" | 18 | SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
19 | SRCREV_machine_fri2-noemgd = "21df0c8486e129a4087970a07b423c533ae05de7" | 19 | SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
20 | 20 | ||
21 | module_autoload_iwlwifi = "iwlwifi" | 21 | module_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 ec67460a..50f8561c 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 | ||
4 | COMPATIBLE_MACHINE_nuc = "nuc" | 4 | COMPATIBLE_MACHINE_nuc = "nuc" |
5 | KMACHINE_nuc = "chiefriver" | 5 | KMACHINE_nuc = "chiefriver" |
6 | KBRANCH_nuc = "standard/common-pc-64/chiefriver" | 6 | KBRANCH_nuc = "standard/base" |
7 | 7 | ||
8 | KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" | 8 | KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" |
9 | 9 | ||
10 | LINUX_VERSION = "3.10.19" | 10 | LINUX_VERSION = "3.10.34" |
11 | 11 | ||
12 | SRCREV_meta_nuc = "d9cd83c0292bd4e2a6754a96761027252e726a42" | 12 | SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4" |
13 | SRCREV_machine_nuc = "a9ec82e355130160f9094e670bd5be0022a84194" | 13 | SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09" |
14 | 14 | ||
15 | module_autoload_iwlwifi_nuc = "iwlwifi" | 15 | module_autoload_iwlwifi_nuc = "iwlwifi" |