From 995a5ac02c67081724cbc93b2b932be4b8c2780b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 6 Aug 2012 14:32:18 -0500 Subject: yocto-bsp: remove 'branch' statements in .scc if reusing branch If reusing a branch (need_new_branch == 'n') we don't need to branch in the .scc, so make it conditional on need_new_branch. (From meta-yocto rev: 1e698ad2d18249c6224821bd52e3b979750db256) Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files') diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc index 4a034fafd9..3253133ee2 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -3,6 +3,7 @@ define KTYPE standard define KARCH x86_64 include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc -- cgit v1.2.3-54-g00ecf