diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-05-21 15:43:19 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-05-22 22:58:14 -0700 |
commit | 50d1ca984b55ed95d40847452c75aee774f7b32d (patch) | |
tree | e3c0918bacaeb5449dff4d235d078493f5a471d4 | |
parent | 03c1dd5ca66fac19e681d52dd398591fd414a518 (diff) | |
download | meta-intel-50d1ca984b55ed95d40847452c75aee774f7b32d.tar.gz |
intel-common: Remove SRCREVs from linux-yocto-dev
The default AUTOREV mechanism is thwarted by SRCREV overrides in
bbappends. -dev is intended to be built using AUTOREV unless overriden
by the user in local.conf or similar. Use the defaults in the bbappends.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
(cherry picked from commit 8b4ab82ba06f58028d66133f233193768c1ad1e1)
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-dev.bbappend | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index 1133ebb3..b8c06df0 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -4,20 +4,20 @@ KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | |||
4 | 4 | ||
5 | LINUX_VERSION_core2-32-intel-common = "3.14-rc8" | 5 | LINUX_VERSION_core2-32-intel-common = "3.14-rc8" |
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
7 | SRCREV_meta_core2-32-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" | ||
8 | SRCREV_machine_core2-32-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" | ||
9 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 7 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
10 | KBRANCH_core2-32-intel-common = "standard/base" | 8 | KBRANCH_core2-32-intel-common = "standard/base" |
11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 9 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
12 | 10 | ||
13 | LINUX_VERSION_corei7-64-intel-common = "3.14-rc8" | 11 | LINUX_VERSION_corei7-64-intel-common = "3.14-rc8" |
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 12 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" | ||
16 | SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" | ||
17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 13 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_corei7-64-intel-common = "standard/base" | 14 | KBRANCH_corei7-64-intel-common = "standard/base" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 15 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
20 | 16 | ||
17 | # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV | ||
18 | # and setting them here breaks the default mechanism to use AUTOREV if the | ||
19 | # default SRCREV is set and linux-yocto-dev is the preferred provider. | ||
20 | |||
21 | # For Crystalforest and Romley | 21 | # For Crystalforest and Romley |
22 | module_autoload_uio = "uio" | 22 | module_autoload_uio = "uio" |
23 | 23 | ||