sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2012-08-06 14:32:18 -05:00 committed by Richard Purdie
parent e26589eb19
commit 995a5ac02c
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -3,6 +3,7 @@ define KTYPE standard
define KARCH arm
include ktypes/standard
{{ if need_new_kbranch == "y": }}
branch {{=machine}}
include {{=machine}}.scc

1
scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -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

1
scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -3,6 +3,7 @@ define KTYPE standard
define KARCH mips
include ktypes/standard
{{ if need_new_kbranch == "y": }}
branch {{=machine}}
include {{=machine}}.scc

1
scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -3,6 +3,7 @@ define KTYPE standard
define KARCH powerpc
include ktypes/standard
{{ if need_new_kbranch == "y": }}
branch {{=machine}}
include {{=machine}}.scc

5
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
View File

@ -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

5
scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -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

1
scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc
View File

@ -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