From: Tom Zanussi Date: Mon, 6 Aug 2012 19:32:18 +0000 (-0500) Subject: yocto-bsp: remove 'branch' statements in .scc if reusing branch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e698ad2d18249c6224821bd52e3b979750db256;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Tom Zanussi Signed-off-by: Saul Wold --- diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc index cd8fa9cbf5a..d13167850b3 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -3,6 +3,7 @@ define KTYPE standard define KARCH arm include ktypes/standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc index c7ba1fba6f0..a241b291451 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -3,6 +3,7 @@ define KTYPE standard define KARCH i386 include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc index c6139f08195..3b916b4c33c 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -3,6 +3,7 @@ define KTYPE standard define KARCH mips include ktypes/standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc index 1213e61a010..a521874f329 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -3,6 +3,7 @@ define KTYPE standard define KARCH powerpc include ktypes/standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.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 6399a4b5354..0f5a5824468 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 diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc index 4def04ac7b8..04a36203d9e 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc @@ -13,18 +13,15 @@ define KARCH mips {{ if qemuarch == "i386": }} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} -branch {{=machine}} {{ if qemuarch == "x86_64": }} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} -branch {{=machine}} {{ if qemuarch == "arm": }} include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard -branch {{=machine}} {{ if qemuarch == "powerpc": }} include bsp/qemu-ppc32/qemu-ppc32-standard -branch {{=machine}} {{ if qemuarch == "mips": }} include bsp/mti-malta32/mti-malta32-be-standard +{{ if need_new_kbranch == "y": }} branch {{=machine}} include {{=machine}}.scc 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 4a034fafd98..3253133ee20 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