[meta-intel] [PATCH 1/1] meta-valleyisland: Add linux-yocto 3.10 recipe

[Kamble, Nitin A]

On 5/28/2014 5:40 PM, Ong Boon Leong wrote:
> From: Chan Wei Sern <wei.sern.chan at intel.com>
>
> 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 at intel.com>
> Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang at intel.com>
> Acked-By: Nitin A Kamble <nitin.a.kamble at intel.com>
Acked for dora branch.
Nitin
> Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
> (cherry picked from commit 756a8fbfcdeca36dcf5a3bea00d26a7762ccf984)
> Signed-off-by: Ong Boon Leong <boon.leong.ong at intel.com>
>
> Conflicts:
>   linux-yocto_3.10.bbappend - resolve cherry-pick conflicts by picking
>   the recipe to use the latest v3.10.40.
> ---
>   .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 26 +++++++++++++++-------
>   1 file 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 8eb014a..084bb47 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"
>   KMACHINE_valleyisland-32 = "valleyisland-32"
>   KBRANCH_valleyisland-32 = "standard/base"
>   
> -KERNEL_FEATURES_append_valleyisland-32 = "features/valleyisland-io/valleyisland-io"
> +KERNEL_FEATURES_append_valleyisland-32 = " features/valleyisland-io/valleyisland-io \
> +					   features/valleyisland-io/valleyisland-io-pci"
>   
> -LINUX_VERSION_valleyisland-32 = "3.10.35"
> -SRCREV_machine_valleyisland-32 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
> -SRCREV_meta_valleyisland-32 = "df3aa753c8826127fb5ad811d56d57168551d6e4"
> +LINUX_VERSION_valleyisland-32 = "3.10.40"
> +SRCREV_machine_valleyisland-32 = "f53a6114b3a6e8c03ca4752de829887015f4c942"
> +SRCREV_meta_valleyisland-32 = "90edb289dccfe838d4e364e1a5815447a6642b98"
> +SRCREV_valleyisland-io_valleyisland-32 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe504"
> +
> +SRC_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"
>   
>   #############################
>   # MACHINE = valleyisland-64 #
> @@ -20,8 +24,14 @@ COMPATIBLE_MACHINE_valleyisland-64 = "valleyisland-64"
>   KMACHINE_valleyisland-64 = "valleyisland"
>   KBRANCH_valleyisland-64 = "standard/base"
>   
> -KERNEL_FEATURES_append_valleyisland-64 = "features/valleyisland-io/valleyisland-io"
> +KERNEL_FEATURES_append_valleyisland-64 = " features/valleyisland-io/valleyisland-io \
> +					   features/valleyisland-io/valleyisland-io-pci"
> +
> +LINUX_VERSION_valleyisland-64 = "3.10.40"
> +SRCREV_machine_valleyisland-64 = "f53a6114b3a6e8c03ca4752de829887015f4c942"
> +SRCREV_meta_valleyisland-64 = "90edb289dccfe838d4e364e1a5815447a6642b98"
> +SRCREV_valleyisland-io_valleyisland-64 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe504"
> +
> +SRC_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"
>   
> -LINUX_VERSION_valleyisland-64 = "3.10.35"
> -SRCREV_machine_valleyisland-64 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
> -SRCREV_meta_valleyisland-64 = "df3aa753c8826127fb5ad811d56d57168551d6e4"
> +module_autoload_i2c-dev = "i2c-dev"