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 | |
parent | e26589eb1963956a68123ff6dcb4620dc40a1de0 (diff) | |
download | ast2050-yocto-poky-995a5ac02c67081724cbc93b2b932be4b8c2780b.zip ast2050-yocto-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>
7 files changed, 7 insertions, 8 deletions
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 cd8fa9c..d131678 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 c7ba1fb..a241b29 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 c6139f0..3b916b4 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 1213e61..a521874 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 6399a4b..0f5a582 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 4def04a..04a3620 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 4a034fa..3253133 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 |