summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2014-06-11 21:37:31 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-06-11 21:37:31 (GMT)
commit5ab97f62f8ac4cae0924d5dc913a32b8b23d90b1 (patch)
tree792dfa28bb62d74360aaac3cffd3d149d73e63f9
parentb2798d571fa4971e2cf1252d4ac465ea0bcdadde (diff)
downloadmeta-intel-5ab97f62f8ac4cae0924d5dc913a32b8b23d90b1.tar.gz
Revert "common: Update linux-yocto v3.10 recipes SRCREVs to v3.10.41"
This reverts commit 1c63f3db93c599df5493310fef986afa40a48934. The reverted commit causes a build problem for lttng-modules - reverting until fixed and tested.
-rw-r--r--common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend12
-rw-r--r--common/recipes-kernel/linux/linux-yocto_3.10.bbappend12
2 files changed, 12 insertions, 12 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index c8d5d31..b388122 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -3,18 +3,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3# For Valley Island 3# For Valley Island
4KERNEL_FEATURES_INTEL_COMMON = "features/valleyisland-io/valleyisland-io.scc" 4KERNEL_FEATURES_INTEL_COMMON = "features/valleyisland-io/valleyisland-io.scc"
5 5
6LINUX_VERSION_core2-32-intel-common = "3.10.41" 6LINUX_VERSION_core2-32-intel-common = "3.10.38"
7COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 7COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
8SRCREV_meta_core2-32-intel-common = "b6d95bb5bf6b9e9b5c149e68ffed6db7a58b4187" 8SRCREV_meta_core2-32-intel-common = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
9SRCREV_machine_core2-32-intel-common = "f49f81e77f7bf3191a11c2557b2b47a8d0927a3a" 9SRCREV_machine_core2-32-intel-common = "8aa9023c5e2e2ca4180e971da9a2c139d5b3c79e"
10KMACHINE_core2-32-intel-common = "intel-core2-32" 10KMACHINE_core2-32-intel-common = "intel-core2-32"
11KBRANCH_core2-32-intel-common = "standard/preempt-rt/base" 11KBRANCH_core2-32-intel-common = "standard/preempt-rt/base"
12KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 12KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
13 13
14LINUX_VERSION_corei7-64-intel-common = "3.10.41" 14LINUX_VERSION_corei7-64-intel-common = "3.10.38"
15COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 15COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
16SRCREV_meta_corei7-64-intel-common = "b6d95bb5bf6b9e9b5c149e68ffed6db7a58b4187" 16SRCREV_meta_corei7-64-intel-common = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
17SRCREV_machine_corei7-64-intel-common = "f49f81e77f7bf3191a11c2557b2b47a8d0927a3a" 17SRCREV_machine_corei7-64-intel-common = "8aa9023c5e2e2ca4180e971da9a2c139d5b3c79e"
18KMACHINE_corei7-64-intel-common = "intel-corei7-64" 18KMACHINE_corei7-64-intel-common = "intel-corei7-64"
19KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" 19KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
index ce8d865..3bb5343 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -4,18 +4,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
4KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc \ 4KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc \
5 features/valleyisland-io/valleyisland-io.scc" 5 features/valleyisland-io/valleyisland-io.scc"
6 6
7LINUX_VERSION_core2-32-intel-common = "3.10.41" 7LINUX_VERSION_core2-32-intel-common = "3.10.38"
8COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 8COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
9SRCREV_meta_core2-32-intel-common = "b6d95bb5bf6b9e9b5c149e68ffed6db7a58b4187" 9SRCREV_meta_core2-32-intel-common = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
10SRCREV_machine_core2-32-intel-common = "ca510b5192c3b3814f1d1a19403d8847ba5db12b" 10SRCREV_machine_core2-32-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388"
11KMACHINE_core2-32-intel-common = "intel-core2-32" 11KMACHINE_core2-32-intel-common = "intel-core2-32"
12KBRANCH_core2-32-intel-common = "standard/base" 12KBRANCH_core2-32-intel-common = "standard/base"
13KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 13KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
14 14
15LINUX_VERSION_corei7-64-intel-common = "3.10.41" 15LINUX_VERSION_corei7-64-intel-common = "3.10.38"
16COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 16COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
17SRCREV_meta_corei7-64-intel-common = "b6d95bb5bf6b9e9b5c149e68ffed6db7a58b4187" 17SRCREV_meta_corei7-64-intel-common = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
18SRCREV_machine_corei7-64-intel-common = "ca510b5192c3b3814f1d1a19403d8847ba5db12b" 18SRCREV_machine_corei7-64-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388"
19KMACHINE_corei7-64-intel-common = "intel-corei7-64" 19KMACHINE_corei7-64-intel-common = "intel-corei7-64"
20KBRANCH_corei7-64-intel-common = "standard/base" 20KBRANCH_corei7-64-intel-common = "standard/base"
21KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 21KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"