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-25 14:47:04 +0100 |
commit | 995a5ac02c67081724cbc93b2b932be4b8c2780b (patch) | |
tree | df97bc87a4de18c2b1fa4733bc96c3789c890507 /scripts/lib/bsp/substrate/target/arch/i386 | |
parent | e26589eb1963956a68123ff6dcb4620dc40a1de0 (diff) | |
download | poky-995a5ac02c67081724cbc93b2b932be4b8c2780b.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.
(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>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386')
-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 |