[poky] [PATCH] [jethro] yocto-bsp: Set correct default branches and branches base for i386, qemu and x86_64 archs

[Ibarra Lopez, Humberto]

Forgot to copy Robert Yang .

> -----Original Message-----
> From: Ibarra Lopez, Humberto
> Sent: Wednesday, March 30, 2016 11:43 PM
> To: poky at yoctoproject.org
> Cc: sgw at linux.intel.com; tom.zanussi at linux.intel.com;
> leonardo.sandoval.gonzalez at linux.intel.com; Ibarra Lopez, Humberto
> <humberto.ibarra.lopez at intel.com>
> Subject: [PATCH] [jethro] yocto-bsp: Set correct default branches and
> branches base for i386, qemu and x86_64 archs
> 
> Kernel recipes for linux-yocto_4.1 have outdated branches as default,
> making it impossible to find the right branch if the user picks the default
> value.
> The branches_base property uses these outdated branches also.
> 
> This updates standard/common-pc and standard/common-pc-64 branches to
> standard/base
> 
> The fix was tested using 'yocto-bsp create' with each one of the following
> archs:
> 
> -i386
> -x86_64
> -qemu (i386 and x86_64)
> 
> After the layer was created, it was added to local.conf and the MACHINE was
> set accordingly.
> 
> 'bitbake linux-yocto' ran successfully with each configuration tested.
> 
> [YOCTO #9160]
> 
> Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez at intel.com>
> ---
>  .../arch/i386/recipes-kernel/linux/linux-yocto_4.1.bbappend       | 4 ++--
>  .../arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend       | 8 ++++--
> --
>  .../arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend       | 8 ++++--
> --
>  .../arch/x86_64/recipes-kernel/linux/linux-yocto_4.1.bbappend     | 4 ++--
>  4 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-
> kernel/linux/linux-yocto_4.1.bbappend
> b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-
> yocto_4.1.bbappend
> index 761b9c6..aecdff0 100644
> --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-
> yocto_4.1.bbappend
> +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/li
> +++ nux-yocto_4.1.bbappend
> @@ -8,10 +8,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
>  {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you
> need a new machine branch for this BSP (the alternative is to re-use an
> existing branch)? [y/n]" default:"y" }}
> 
>  {{ if need_new_kbranch == "y": }}
> -{{ input type:"choicelist" name:"new_kbranch"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/base" }}
> +{{ input type:"choicelist" name:"new_kbranch"
> +gen:"bsp.kernel.all_branches" branches_base:"standard:standard"
> +prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n": }}
> -{{ input type:"choicelist" name:"existing_kbranch"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/base" }}
> +{{ input type:"choicelist" name:"existing_kbranch"
> +gen:"bsp.kernel.all_branches" branches_base:"standard:standard"
> +prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n": }}
>  KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"
> diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-
> kernel/linux/linux-yocto-dev.bbappend
> b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-
> yocto-dev.bbappend
> index 3555285..7e3ce5b 100644
> --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-
> yocto-dev.bbappend
> +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/li
> +++ nux-yocto-dev.bbappend
> @@ -19,16 +19,16 @@ COMPATIBLE_MACHINE_{{=machine}} =
> "{{=machine}}"
>  {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc"
> gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/qemuppc" }}
> 
>  {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input
> type:"choicelist" name:"new_kbranch" nameappend:"i386"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc" }}
> +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386"
> +gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n" and qemuarch == "i386": }} -{{ input
> type:"choicelist" name:"existing_kbranch" nameappend:"i386"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc" }}
> +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386"
> +gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input
> type:"choicelist" name:"new_kbranch" nameappend:"x86_64"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc-64"  prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc-64/base" }}
> +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64"
> +gen:"bsp.kernel.all_branches" branches_base:"standard"  prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} -{{ input
> type:"choicelist" name:"existing_kbranch" nameappend:"x86_64"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc-64"  prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc-64/base" }}
> +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64"
> +gen:"bsp.kernel.all_branches" branches_base:"standard"  prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "y" and qemuarch == "mips": }}  {{ input
> type:"choicelist" name:"new_kbranch" nameappend:"mips"
> gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/base" }} diff --git
> a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-
> yocto_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-
> kernel/linux/linux-yocto_4.1.bbappend
> index 82bb970..fce67b4 100644
> --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-
> yocto_4.1.bbappend
> +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/li
> +++ nux-yocto_4.1.bbappend
> @@ -19,16 +19,16 @@ COMPATIBLE_MACHINE_{{=machine}} =
> "{{=machine}}"
>  {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc"
> gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/qemuppc" }}
> 
>  {{ if need_new_kbranch == "y" and qemuarch == "i386": }} -{{ input
> type:"choicelist" name:"new_kbranch" nameappend:"i386"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc" }}
> +{{ input type:"choicelist" name:"new_kbranch" nameappend:"i386"
> +gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n" and qemuarch == "i386": }} -{{ input
> type:"choicelist" name:"existing_kbranch" nameappend:"i386"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc" }}
> +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386"
> +gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} -{{ input
> type:"choicelist" name:"new_kbranch" nameappend:"x86_64"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc-64"  prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc-64/base" }}
> +{{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64"
> +gen:"bsp.kernel.all_branches" branches_base:"standard"  prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} -{{ input
> type:"choicelist" name:"existing_kbranch" nameappend:"x86_64"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc-64"  prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc-64/base" }}
> +{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64"
> +gen:"bsp.kernel.all_branches" branches_base:"standard"  prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n" and qemuarch == "mips": }}  {{ input
> type:"choicelist" name:"existing_kbranch" nameappend:"mips"
> gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/mti-malta32" }} diff --git
> a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-
> yocto_4.1.bbappend
> b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-
> yocto_4.1.bbappend
> index 8d0bc97..1e99a04 100644
> --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-
> kernel/linux/linux-yocto_4.1.bbappend
> +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/
> +++ linux-yocto_4.1.bbappend
> @@ -8,10 +8,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
>  {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you
> need a new machine branch for this BSP (the alternative is to re-use an
> existing branch)? [y/n]" default:"y" }}
> 
>  {{ if need_new_kbranch == "y": }}
> -{{ input type:"choicelist" name:"new_kbranch"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc-64/base" }}
> +{{ input type:"choicelist" name:"new_kbranch"
> +gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n": }}
> -{{ input type:"choicelist" name:"existing_kbranch"
> gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-
> pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:"
> default:"standard/common-pc-64/base" }}
> +{{ input type:"choicelist" name:"existing_kbranch"
> +gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20"
> +msg:"Please choose a machine branch to base this BSP on:"
> +default:"standard/base" }}
> 
>  {{ if need_new_kbranch == "n": }}
>  KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"
> --
> 2.1.4