summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-06-18 23:39:25 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:02 +0100
commitd35a34b38a545db152708a27f13520bfec16744c (patch)
tree1f813b5edb8e74c2da2fe05462f8d34f2c691e5c /scripts
parent3405a8bbe4a596679ba09f0287a5d479afc605be (diff)
downloadpoky-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')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend4
-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.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend4
24 files changed, 48 insertions, 48 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
index 144acd3e54..a55e6c7fbe 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.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:"yocto/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:"yocto/standard/preempt-rt/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/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/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/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": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
index 12de75eeba..87741b6173 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
@@ -13,7 +13,7 @@ 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:"yocto/standard" }} 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:"yocto/standard" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}"
24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
25 25
26{{ if need_new_kbranch == "y": }} 26{{ if need_new_kbranch == "y": }}
27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
28{{ if need_new_kbranch == "n": }} 28{{ if need_new_kbranch == "n": }}
29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}" 29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
30 30
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 5480e90b26..393bed33d9 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
@@ -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/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" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
index 144acd3e54..a55e6c7fbe 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.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:"yocto/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:"yocto/standard/preempt-rt/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
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": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
index 39bf0f3155..7f35c2417c 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
@@ -13,7 +13,7 @@ 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:"yocto/standard/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:"yocto/standard/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}"
24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
25 25
26{{ if need_new_kbranch == "y": }} 26{{ if need_new_kbranch == "y": }}
27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
28{{ if need_new_kbranch == "n": }} 28{{ if need_new_kbranch == "n": }}
29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}" 29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
30 30
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 4877aa231f..88b486f297 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_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/default/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/default/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
index 144acd3e54..a55e6c7fbe 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.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:"yocto/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:"yocto/standard/preempt-rt/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/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/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/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": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
index 12de75eeba..87741b6173 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
@@ -13,7 +13,7 @@ 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:"yocto/standard" }} 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:"yocto/standard" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}"
24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
25 25
26{{ if need_new_kbranch == "y": }} 26{{ if need_new_kbranch == "y": }}
27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
28{{ if need_new_kbranch == "n": }} 28{{ if need_new_kbranch == "n": }}
29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}" 29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
30 30
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 5480e90b26..393bed33d9 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_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/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" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
index 144acd3e54..a55e6c7fbe 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.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:"yocto/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:"yocto/standard/preempt-rt/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/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/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/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": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
index 12de75eeba..87741b6173 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
@@ -13,7 +13,7 @@ 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:"yocto/standard" }} 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:"yocto/standard" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}"
24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
25 25
26{{ if need_new_kbranch == "y": }} 26{{ if need_new_kbranch == "y": }}
27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
28{{ if need_new_kbranch == "n": }} 28{{ if need_new_kbranch == "n": }}
29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}" 29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
30 30
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 5480e90b26..393bed33d9 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_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/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" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
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": }}
40KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 40KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
41{{ if need_new_kbranch == "n": }} 41{{ if need_new_kbranch == "n": }}
42KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 42KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
43 43
44{{ if need_new_kbranch == "y": }} 44{{ if need_new_kbranch == "y": }}
45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
46 46
47KMACHINE_{{=machine}} = "{{=machine}}" 47KMACHINE_{{=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": }}
40KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 40KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
41{{ if need_new_kbranch == "n": }} 41{{ if need_new_kbranch == "n": }}
42KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 42KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
43 43
44{{ if need_new_kbranch == "y": }} 44{{ if need_new_kbranch == "y": }}
45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
46 46
47KMACHINE_{{=machine}} = "{{=machine}}" 47KMACHINE_{{=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": }}
40KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 40KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
41{{ if need_new_kbranch == "n": }} 41{{ if need_new_kbranch == "n": }}
42KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 42KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
43 43
44{{ if need_new_kbranch == "y": }} 44{{ if need_new_kbranch == "y": }}
45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
46 46
47KMACHINE_{{=machine}} = "{{=machine}}" 47KMACHINE_{{=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": }}
40KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 40KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
41{{ if need_new_kbranch == "n": }} 41{{ if need_new_kbranch == "n": }}
42KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 42KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
43 43
44{{ if need_new_kbranch == "y": }} 44{{ if need_new_kbranch == "y": }}
45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 45YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
46 46
47KMACHINE_{{=machine}} = "{{=machine}}" 47KMACHINE_{{=machine}} = "{{=machine}}"
48 48
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
index 144acd3e54..a55e6c7fbe 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.0": }} linux-yocto-rt_3.0.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:"yocto/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:"yocto/standard/preempt-rt/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/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/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/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": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
index 377e6a74a3..5a1ac72766 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.0": }} linux-yocto_3.0.bbappend
@@ -13,7 +13,7 @@ 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:"yocto/standard/common-pc-64/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:"yocto/standard/common-pc-64/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
@@ -24,7 +24,7 @@ KMACHINE_{{=machine}} = "{{=machine}}"
24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 24KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
25 25
26{{ if need_new_kbranch == "y": }} 26{{ if need_new_kbranch == "y": }}
27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 27YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
28{{ if need_new_kbranch == "n": }} 28{{ if need_new_kbranch == "n": }}
29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}" 29YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=existing_kbranch}}"
30 30
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
index 17c98ee9e3..4cafb0eec1 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_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/default/common-pc-64/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/default/common-pc-64/base" }}
14 14
15{{ if need_new_kbranch == "y": }} 15{{ if need_new_kbranch == "y": }}
16KBRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 16KBRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
17{{ if need_new_kbranch == "n": }} 17{{ if need_new_kbranch == "n": }}
18KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 18KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
19 19
20{{ if need_new_kbranch == "y": }} 20{{ if need_new_kbranch == "y": }}
21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=new_kbranch}}/{{=machine}}" 21YOCTO_KERNEL_EXTERNAL_BRANCH_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}"
22 22
23KMACHINE_{{=machine}} = "{{=machine}}" 23KMACHINE_{{=machine}} = "{{=machine}}"
24 24
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 00:18:05 +0000