From ead9ada172e93117f13812bd47aa2ed05dd5a2f3 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 11 Mar 2013 00:20:36 -0500 Subject: yocto-bsp: use map_standard_branch() Use map_standard_branch() instead of naming the branch directly. (From meta-yocto rev: 34ec7d4cf53f82adb8de61969d0981344f9a1d87) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../{{=machine}}-standard.scc" | 2 +- .../{{=machine}}-standard.scc" | 2 +- .../{{=machine}}-standard.scc" | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" index d13167850b..b12c50c90d 100644 --- "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} define KTYPE standard define KARCH arm -include ktypes/standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} branch {{=machine}} diff --git "a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" "b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" index 3b916b4c33..326663a509 100644 --- "a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} define KTYPE standard define KARCH mips -include ktypes/standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} branch {{=machine}} diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" index a521874f32..53a74a6ca2 100644 --- "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} define KTYPE standard define KARCH powerpc -include ktypes/standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} branch {{=machine}} -- cgit v1.2.3-54-g00ecf