summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-06 14:32:18 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:04 +0100
commit995a5ac02c67081724cbc93b2b932be4b8c2780b (patch)
treedf97bc87a4de18c2b1fa4733bc96c3789c890507 /scripts
parente26589eb1963956a68123ff6dcb4620dc40a1de0 (diff)
downloadpoky-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')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/{{=machine}}-standard.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/{{=machine}}-standard.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/{{=machine}}-standard.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc5
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc5
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc1
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 cd8fa9cbf5..d13167850b 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
3define KARCH arm 3define KARCH arm
4 4
5include ktypes/standard 5include ktypes/standard
6{{ if need_new_kbranch == "y": }}
6branch {{=machine}} 7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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 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
3define KARCH i386 3define KARCH i386
4 4
5include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 5include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6{{ if need_new_kbranch == "y": }}
6branch {{=machine}} 7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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 c6139f0819..3b916b4c33 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
3define KARCH mips 3define KARCH mips
4 4
5include ktypes/standard 5include ktypes/standard
6{{ if need_new_kbranch == "y": }}
6branch {{=machine}} 7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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 1213e61a01..a521874f32 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
3define KARCH powerpc 3define KARCH powerpc
4 4
5include ktypes/standard 5include ktypes/standard
6{{ if need_new_kbranch == "y": }}
6branch {{=machine}} 7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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 6399a4b535..0f5a582446 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
13 13
14{{ if qemuarch == "i386": }} 14{{ if qemuarch == "i386": }}
15include bsp/common-pc/common-pc-preempt-rt 15include bsp/common-pc/common-pc-preempt-rt
16branch {{=machine}}
17{{ if qemuarch == "x86_64": }} 16{{ if qemuarch == "x86_64": }}
18include bsp/common-pc-64/common-pc-64-preempt-rt 17include bsp/common-pc-64/common-pc-64-preempt-rt
19branch {{=machine}}
20{{ if qemuarch == "arm": }} 18{{ if qemuarch == "arm": }}
21include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt 19include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt
22branch {{=machine}}
23{{ if qemuarch == "powerpc": }} 20{{ if qemuarch == "powerpc": }}
24include bsp/qemu-ppc32/qemu-ppc32-rt 21include bsp/qemu-ppc32/qemu-ppc32-rt
25branch {{=machine}}
26{{ if qemuarch == "mips": }} 22{{ if qemuarch == "mips": }}
27include bsp/mti-malta32/mti-malta32-be-preempt-rt 23include bsp/mti-malta32/mti-malta32-be-preempt-rt
24{{ if need_new_kbranch == "y": }}
28branch {{=machine}} 25branch {{=machine}}
29 26
30include {{=machine}}.scc 27include {{=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 4def04ac7b..04a36203d9 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
13 13
14{{ if qemuarch == "i386": }} 14{{ if qemuarch == "i386": }}
15include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 15include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
16branch {{=machine}}
17{{ if qemuarch == "x86_64": }} 16{{ if qemuarch == "x86_64": }}
18include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 17include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
19branch {{=machine}}
20{{ if qemuarch == "arm": }} 18{{ if qemuarch == "arm": }}
21include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard 19include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard
22branch {{=machine}}
23{{ if qemuarch == "powerpc": }} 20{{ if qemuarch == "powerpc": }}
24include bsp/qemu-ppc32/qemu-ppc32-standard 21include bsp/qemu-ppc32/qemu-ppc32-standard
25branch {{=machine}}
26{{ if qemuarch == "mips": }} 22{{ if qemuarch == "mips": }}
27include bsp/mti-malta32/mti-malta32-be-standard 23include bsp/mti-malta32/mti-malta32-be-standard
24{{ if need_new_kbranch == "y": }}
28branch {{=machine}} 25branch {{=machine}}
29 26
30include {{=machine}}.scc 27include {{=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 4a034fafd9..3253133ee2 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
3define KARCH x86_64 3define KARCH x86_64
4 4
5include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 5include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6{{ if need_new_kbranch == "y": }}
6branch {{=machine}} 7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=machine}}.scc