yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases
The new yocto-kernel way of specifying that the branch sanity check doesn't need to be run is to specify a default kbranch and build that. In the case where we have a new kbranch but it's not yet in the repo, we need to tell it that our new branch is the default and we're building the default and that's how we avoid the sanity check and the subsequent do_validate_branches() failure. (From meta-yocto rev: dadd020c67e901609be3ac13a4ffd8cb28532966) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6b96147048
commit
bb0aab79e4
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ 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 == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ 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" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ 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 == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ 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 == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ 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-be" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
|
@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
|
|||
{{ 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" }}
|
||||
|
||||
{{ if need_new_kbranch == "y": }}
|
||||
KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
|
||||
KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}"
|
||||
{{ if need_new_kbranch == "n": }}
|
||||
KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue