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/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc') diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc index 6399a4b535..0f5a582446 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc @@ -13,18 +13,15 @@ define KARCH mips {{ if qemuarch == "i386": }} include bsp/common-pc/common-pc-preempt-rt -branch {{=machine}} {{ if qemuarch == "x86_64": }} include bsp/common-pc-64/common-pc-64-preempt-rt -branch {{=machine}} {{ if qemuarch == "arm": }} include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt -branch {{=machine}} {{ if qemuarch == "powerpc": }} include bsp/qemu-ppc32/qemu-ppc32-rt -branch {{=machine}} {{ if qemuarch == "mips": }} include bsp/mti-malta32/mti-malta32-be-preempt-rt +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc -- cgit v1.2.3-54-g00ecf