diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-06-18 23:39:25 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 11:35:20 +0100 |
commit | e5c5e20a5e6a555f68339ade610d8f0b3c97c533 (patch) | |
tree | 053e7570c2a65ac88b63803bbc3c48a04a70920d /scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel | |
parent | 96631f080b6a2ef181486cc2e2c74514dd45c1f4 (diff) | |
download | poky-e5c5e20a5e6a555f68339ade610d8f0b3c97c533.tar.gz |
yocto-bsp: strip '/base' from kernel branches in templates
For new branches, users can specify /base branches, but we don't want
the '/base' in the resultant branch name, so remove it.
Fixes [YOCTO #2693].
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel')
4 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend index 21e52343a6..db15e455ae 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend | |||
@@ -37,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} | 37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/preempt-rt/base" }} |
38 | 38 | ||
39 | {{ if need_new_kbranch == "y": }} | 39 | {{ if need_new_kbranch == "y": }} |
40 | KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | {{ if need_new_kbranch == "n": }} | 41 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 43 | ||
44 | {{ if need_new_kbranch == "y": }} | 44 | {{ if need_new_kbranch == "y": }} |
45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
46 | 46 | ||
47 | KMACHINE_{{=machine}} = "{{=machine}}" | 47 | KMACHINE_{{=machine}} = "{{=machine}}" |
48 | 48 | ||
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 c0e22c7701..75e6bd85de 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,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" 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" 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}} = "{{=new_kbranch}}/{{=machine}}" | 40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | {{ if need_new_kbranch == "n": }} | 41 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 43 | ||
44 | {{ if need_new_kbranch == "y": }} | 44 | {{ if need_new_kbranch == "y": }} |
45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
46 | 46 | ||
47 | KMACHINE_{{=machine}} = "{{=machine}}" | 47 | KMACHINE_{{=machine}} = "{{=machine}}" |
48 | 48 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend index 56c40299ab..4a58c00294 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend | |||
@@ -37,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} | 37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"yocto/standard/mti-malta32-be" }} |
38 | 38 | ||
39 | {{ if need_new_kbranch == "y": }} | 39 | {{ if need_new_kbranch == "y": }} |
40 | KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | {{ if need_new_kbranch == "n": }} | 41 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 43 | ||
44 | {{ if need_new_kbranch == "y": }} | 44 | {{ if need_new_kbranch == "y": }} |
45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
46 | 46 | ||
47 | KMACHINE_{{=machine}} = "{{=machine}}" | 47 | KMACHINE_{{=machine}} = "{{=machine}}" |
48 | 48 | ||
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 36c5cc3607..3065ee75f1 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,12 +37,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" 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" 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}} = "{{=new_kbranch}}/{{=machine}}" | 40 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
41 | {{ if need_new_kbranch == "n": }} | 41 | {{ if need_new_kbranch == "n": }} |
42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 42 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
43 | 43 | ||
44 | {{ if need_new_kbranch == "y": }} | 44 | {{ if need_new_kbranch == "y": }} |
45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 45 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
46 | 46 | ||
47 | KMACHINE_{{=machine}} = "{{=machine}}" | 47 | KMACHINE_{{=machine}} = "{{=machine}}" |
48 | 48 | ||