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-25 14:47:02 +0100 |
commit | d35a34b38a545db152708a27f13520bfec16744c (patch) | |
tree | 1f813b5edb8e74c2da2fe05462f8d34f2c691e5c /scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend | |
parent | 3405a8bbe4a596679ba09f0287a5d479afc605be (diff) | |
download | poky-d35a34b38a545db152708a27f13520bfec16744c.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].
(From meta-yocto rev: 40e925862884fd981dec63fc598326c73e4a4c20)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend index 7fc48a5971..d60b7cea99 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend | |||
@@ -13,12 +13,12 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
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/preempt-rt/base" }} | 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/preempt-rt/base" }} |
14 | 14 | ||
15 | {{ if need_new_kbranch == "y": }} | 15 | {{ if need_new_kbranch == "y": }} |
16 | KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 16 | KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
17 | {{ if need_new_kbranch == "n": }} | 17 | {{ if need_new_kbranch == "n": }} |
18 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 18 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
19 | 19 | ||
20 | {{ if need_new_kbranch == "y": }} | 20 | {{ if need_new_kbranch == "y": }} |
21 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" | 21 | YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" |
22 | 22 | ||
23 | KMACHINE_{{=machine}} = "{{=machine}}" | 23 | KMACHINE_{{=machine}} = "{{=machine}}" |
24 | 24 | ||