summaryrefslogtreecommitdiffstats
path: root/meta-isg/meta-valleyisland
diff options
context:
space:
mode:
authorChan Wei Sern <wei.sern.chan@intel.com>2014-05-23 23:17:19 +0800
committerTom Zanussi <tom.zanussi@linux.intel.com>2014-05-28 17:47:14 -0500
commit7203d4de60f69190b5eae308ed2d09edbc63ea1f (patch)
tree0b6f037d80ebe95cac0ca38f373861086602a884 /meta-isg/meta-valleyisland
parent569d49422d529be58b09ab71401b799c5b8f674e (diff)
downloadmeta-intel-7203d4de60f69190b5eae308ed2d09edbc63ea1f.tar.gz
meta-valleyisland: Add linux-yocto 3.10 recipe
Added linux-yocto 3.10 due to it cannot be shared with common intel recipe kernel. The reason cannot be shared as for valleyisland case has additional feature that is still pending to pull into LTS/LTSI and hence it cannot be merged into "standard/base". For this particular reason, a feature branch of "valleyisland-io-1.0" is introduced to include additional feature. However in order to make it more align with intel common recipe kernel,machine branch is pointing to "standard/base" and SRCREV for meta remains closest as possible. Signed-off-by: Chan Wei Sern <wei.sern.chan@intel.com> Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> Acked-By: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> (cherry picked from commit 756a8fbfcdeca36dcf5a3bea00d26a7762ccf984) Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com> Conflicts: linux-yocto_3.10.bbappend - resolve cherry-pick conflicts by picking the recipe to use the latest v3.10.40.
Diffstat (limited to 'meta-isg/meta-valleyisland')
-rw-r--r--meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend26
1 files changed, 18 insertions, 8 deletions
diff --git a/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 8eb014af..084bb47b 100644
--- a/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -7,11 +7,15 @@ COMPATIBLE_MACHINE_valleyisland-32 = "valleyisland-32"
7KMACHINE_valleyisland-32 = "valleyisland-32" 7KMACHINE_valleyisland-32 = "valleyisland-32"
8KBRANCH_valleyisland-32 = "standard/base" 8KBRANCH_valleyisland-32 = "standard/base"
9 9
10KERNEL_FEATURES_append_valleyisland-32 = "features/valleyisland-io/valleyisland-io" 10KERNEL_FEATURES_append_valleyisland-32 = " features/valleyisland-io/valleyisland-io \
11 features/valleyisland-io/valleyisland-io-pci"
11 12
12LINUX_VERSION_valleyisland-32 = "3.10.35" 13LINUX_VERSION_valleyisland-32 = "3.10.40"
13SRCREV_machine_valleyisland-32 = "cee957655fe67826b2e827e2db41f156fa8f0cc4" 14SRCREV_machine_valleyisland-32 = "f53a6114b3a6e8c03ca4752de829887015f4c942"
14SRCREV_meta_valleyisland-32 = "df3aa753c8826127fb5ad811d56d57168551d6e4" 15SRCREV_meta_valleyisland-32 = "90edb289dccfe838d4e364e1a5815447a6642b98"
16SRCREV_valleyisland-io_valleyisland-32 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe504"
17
18SRC_URI_valleyisland-32 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},valleyisland-io-1.0;name=machine,meta,valleyisland-io"
15 19
16############################# 20#############################
17# MACHINE = valleyisland-64 # 21# MACHINE = valleyisland-64 #
@@ -20,8 +24,14 @@ COMPATIBLE_MACHINE_valleyisland-64 = "valleyisland-64"
20KMACHINE_valleyisland-64 = "valleyisland" 24KMACHINE_valleyisland-64 = "valleyisland"
21KBRANCH_valleyisland-64 = "standard/base" 25KBRANCH_valleyisland-64 = "standard/base"
22 26
23KERNEL_FEATURES_append_valleyisland-64 = "features/valleyisland-io/valleyisland-io" 27KERNEL_FEATURES_append_valleyisland-64 = " features/valleyisland-io/valleyisland-io \
28 features/valleyisland-io/valleyisland-io-pci"
29
30LINUX_VERSION_valleyisland-64 = "3.10.40"
31SRCREV_machine_valleyisland-64 = "f53a6114b3a6e8c03ca4752de829887015f4c942"
32SRCREV_meta_valleyisland-64 = "90edb289dccfe838d4e364e1a5815447a6642b98"
33SRCREV_valleyisland-io_valleyisland-64 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe504"
34
35SRC_URI_valleyisland-64 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},valleyisland-io-1.0;name=machine,meta,valleyisland-io"
24 36
25LINUX_VERSION_valleyisland-64 = "3.10.35" 37module_autoload_i2c-dev = "i2c-dev"
26SRCREV_machine_valleyisland-64 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
27SRCREV_meta_valleyisland-64 = "df3aa753c8826127fb5ad811d56d57168551d6e4"