From: Tom Zanussi <tom.zanu...@intel.com>
The branch updating for the [YOCTO #2587] fix inadvertently changed
some of the qemu branch names incorrectly, fix it.
Signed-off-by: Tom Zanussi <tom.zanu...@intel.com>
---
...yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 2 +-
...yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 2 +-
...linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 6 +++---
...linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 6 +++---
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.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 7bb3ee9..6d6f4b6 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"
@@ -13,7 +13,7 @@ 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" and qemuarch == "powerpc": }}
-{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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/qemu-ppc32" }}
+{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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 == "n" and qemuarch == "powerpc": }}
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc"
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/qemu-ppc32" }}
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 13e96ad..2e3bb00 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"
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"arm"
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" and qemuarch == "powerpc": }}
-{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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/qemu-ppc32" }}
+{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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 == "n" and qemuarch == "powerpc": }}
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc"
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/qemu-ppc32" }}
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 1f8ad71..5f3ec83 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"
@@ -7,13 +7,13 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
{{ 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" }}
{{ if need_new_kbranch == "y" and qemuarch == "arm": }}
-{{ input type:"choicelist" name:"new_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/arm-versatile-926ejs" }}
+{{ input type:"choicelist" name:"new_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 == "n" and qemuarch == "arm": }}
{{ 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/arm-versatile-926ejs" }}
{{ if need_new_kbranch == "y" and qemuarch == "powerpc": }}
-{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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/qemu-ppc32" }}
+{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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 == "n" and qemuarch == "powerpc": }}
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc"
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/qemu-ppc32" }}
@@ -31,7 +31,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64"
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" and qemuarch == "mips": }}
-{{ input type:"choicelist" name:"new_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" }}
+{{ input type:"choicelist" name:"new_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/base" }}
{{ if need_new_kbranch == "n" and qemuarch == "mips": }}
{{ 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" }}
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 4bafac2..977aaf0 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"
@@ -7,13 +7,13 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
{{ 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" }}
{{ if need_new_kbranch == "y" and qemuarch == "arm": }}
-{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches"
branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base
your new BSP branch on:" default:"standard/arm-versatile-926ejs" }}
+{{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches"
branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base
your new BSP branch on:" default:"standard/base" }}
{{ if need_new_kbranch == "n" and qemuarch == "arm": }}
{{ input type:"choicelist" name:"existing_kbranch"
gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please
choose an existing machine branch to use for this BSP:"
default:"standard/arm-versatile-926ejs" }}
{{ if need_new_kbranch == "y" and qemuarch == "powerpc": }}
-{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please
choose a machine branch to base this BSP on:" default:"standard/qemu-ppc32" }}
+{{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc"
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 == "n" and qemuarch == "powerpc": }}
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc"
gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please
choose a machine branch to base this BSP on:" default:"standard/qemu-ppc32" }}
@@ -31,7 +31,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
{{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64"
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" and qemuarch == "mips": }}
-{{ input type:"choicelist" name:"new_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"
}}
+{{ input type:"choicelist" name:"new_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/base" }}
{{ if need_new_kbranch == "n" and qemuarch == "mips": }}
{{ 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"
}}
--
1.7.4.1
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
