diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-09-26 20:25:18 +0000 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-09-26 21:45:53 +0000 |
commit | b25eb7e4dfee7802d4eae657fa5e482a1a010190 (patch) | |
tree | 4e1db42b878bac6e89bc8ea913888adc800ab27d | |
parent | 63c1be532d456f27c8609a11b080fa0f588fef69 (diff) | |
download | meta-intel-b25eb7e4dfee7802d4eae657fa5e482a1a010190.tar.gz |
linux-yocto*_3.14: Update SRCREV_meta to avoid rt build failure
Fixes [YOCTO 6710] linux-yocto-rt recipe failing to build
This meta update reorganizes the intel-common ktype and driver meta
data which was causing the wrong branch to be checked out, resulting in
a build failure for the rt kernel. Update both linux-yocto and
linux-yocto-rt to use the updated intel-common meta data.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Acked-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | 4 | ||||
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend index 1aa46881..a5edfff9 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | |||
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
2 | 2 | ||
3 | LINUX_VERSION_core2-32-intel-common = "3.14.4" | 3 | LINUX_VERSION_core2-32-intel-common = "3.14.4" |
4 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 4 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
5 | SRCREV_meta_core2-32-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" | 5 | SRCREV_meta_core2-32-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" |
6 | SRCREV_machine_core2-32-intel-common = "08229402523bdb153dceed0a7260180837396e7f" | 6 | SRCREV_machine_core2-32-intel-common = "08229402523bdb153dceed0a7260180837396e7f" |
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" |
@@ -10,7 +10,7 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
10 | 10 | ||
11 | LINUX_VERSION_corei7-64-intel-common = "3.14.4" | 11 | LINUX_VERSION_corei7-64-intel-common = "3.14.4" |
12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
13 | SRCREV_meta_corei7-64-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" | 13 | SRCREV_meta_corei7-64-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" |
14 | SRCREV_machine_corei7-64-intel-common = "08229402523bdb153dceed0a7260180837396e7f" | 14 | SRCREV_machine_corei7-64-intel-common = "08229402523bdb153dceed0a7260180837396e7f" |
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" |
diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index b367adb4..22faabbe 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -5,7 +5,7 @@ KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | |||
5 | 5 | ||
6 | LINUX_VERSION_core2-32-intel-common = "3.14.4" | 6 | LINUX_VERSION_core2-32-intel-common = "3.14.4" |
7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
8 | SRCREV_meta_core2-32-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" | 8 | SRCREV_meta_core2-32-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" |
9 | SRCREV_machine_core2-32-intel-common = "cb22733185cd9db3e8945dadb899d9eb3831b9ad" | 9 | SRCREV_machine_core2-32-intel-common = "cb22733185cd9db3e8945dadb899d9eb3831b9ad" |
10 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 10 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
11 | KBRANCH_core2-32-intel-common = "standard/base" | 11 | KBRANCH_core2-32-intel-common = "standard/base" |
@@ -13,7 +13,7 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
13 | 13 | ||
14 | LINUX_VERSION_corei7-64-intel-common = "3.14.4" | 14 | LINUX_VERSION_corei7-64-intel-common = "3.14.4" |
15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
16 | SRCREV_meta_corei7-64-intel-common = "62f236c734996f240d91daee2cb6a05669c7326c" | 16 | SRCREV_meta_corei7-64-intel-common = "fb6271a942b57bdc40c6e49f0203be153699f81c" |
17 | SRCREV_machine_corei7-64-intel-common = "cb22733185cd9db3e8945dadb899d9eb3831b9ad" | 17 | SRCREV_machine_corei7-64-intel-common = "cb22733185cd9db3e8945dadb899d9eb3831b9ad" |
18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
19 | KBRANCH_corei7-64-intel-common = "standard/base" | 19 | KBRANCH_corei7-64-intel-common = "standard/base" |