diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-06 14:32:18 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 11:35:21 +0100 |
| commit | 65706548f66b513a6e4834f26801af9f75c89c5e (patch) | |
| tree | d671094dff939c971a03d731a035764f50ec46d8 /scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel | |
| parent | bc6b04fe222001250b7f730f37153faa71542525 (diff) | |
| download | poky-65706548f66b513a6e4834f26801af9f75c89c5e.tar.gz | |
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 <tom.zanussi@intel.com>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 |
1 files changed, 1 insertions, 0 deletions
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 c7ba1fba6f..a241b29145 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 | |||
| 3 | define KARCH i386 | 3 | define KARCH i386 |
| 4 | 4 | ||
| 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} | 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 6 | {{ if need_new_kbranch == "y": }} | ||
| 6 | branch {{=machine}} | 7 | branch {{=machine}} |
| 7 | 8 | ||
| 8 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |