diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-06-18 23:57:57 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 11:35:21 +0100 |
commit | 717704d12c60cf4d37f10c403ef4c463bc53fcd3 (patch) | |
tree | 33659304ef07538aefdada8a7be6d1635fd059f8 /scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend | |
parent | e5c5e20a5e6a555f68339ade610d8f0b3c97c533 (diff) | |
download | poky-717704d12c60cf4d37f10c403ef4c463bc53fcd3.tar.gz |
yocto-bsp: update default branch names
Make sure the default branch names match branch names found in the
kernel branch listing.
Fixes [YOCTO #2587].
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend index 393bed33d9..04c16e9940 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend | |||
@@ -7,10 +7,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
7 | {{ 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" }} | 7 | {{ 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" }} |
8 | 8 | ||
9 | {{ if need_new_kbranch == "y": }} | 9 | {{ if need_new_kbranch == "y": }} |
10 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} | 10 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} |
11 | 11 | ||
12 | {{ if need_new_kbranch == "n": }} | 12 | {{ if need_new_kbranch == "n": }} |
13 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default" }} | 13 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} |
14 | 14 | ||
15 | {{ if need_new_kbranch == "y": }} | 15 | {{ if need_new_kbranch == "y": }} |
16 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | 16 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |