diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-28 22:01:35 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-29 14:23:36 -0700 |
commit | bb0aab79e488a99cb1b43f72f0e8ddbe39d97519 (patch) | |
tree | 5b3d2ebfd5ce6d7fb6f0d2094c566635b5e9d12d /scripts/lib/bsp/substrate/target/arch/qemu | |
parent | 6b961470486b2dd4215f6753d4f155e6f279959c (diff) | |
download | poky-bb0aab79e488a99cb1b43f72f0e8ddbe39d97519.tar.gz |
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>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/qemu')
4 files changed, 8 insertions, 4 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend index 6d6f4b6001..680973e4a8 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend | |||
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ 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" }} | 37 | {{ 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" }} |
38 | 38 | ||
39 | {{ if need_new_kbranch == "y": }} | 39 | {{ if need_new_kbranch == "y": }} |
40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | 40 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
41 | {{ if need_new_kbranch == "n": }} | 42 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 43 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 44 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend index 2e3bb00780..70ede9f70a 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend | |||
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ 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" }} | 37 | {{ 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" }} |
38 | 38 | ||
39 | {{ if need_new_kbranch == "y": }} | 39 | {{ if need_new_kbranch == "y": }} |
40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | 40 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
41 | {{ if need_new_kbranch == "n": }} | 42 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 43 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 44 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend index 5f3ec83e41..9af21f2b6c 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend | |||
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ 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" }} | 37 | {{ 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" }} |
38 | 38 | ||
39 | {{ if need_new_kbranch == "y": }} | 39 | {{ if need_new_kbranch == "y": }} |
40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | 40 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
41 | {{ if need_new_kbranch == "n": }} | 42 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 43 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 44 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend index 977aaf0bb4..1e90cf278b 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend | |||
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ 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" }} | 37 | {{ 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" }} |
38 | 38 | ||
39 | {{ if need_new_kbranch == "y": }} | 39 | {{ if need_new_kbranch == "y": }} |
40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | 40 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
41 | {{ if need_new_kbranch == "n": }} | 42 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 43 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 44 | ||