[linux-yocto] [PATCH 4/5] minnow: Remove branch statements from minnow scc files

Darren Hart dvhart at linux.intel.com
Wed Nov 13 11:09:38 PST 2013


MinnowBoard now builds from standard/base, there is no
need for the branch command in the scc files which create
or reuse a standard/minnow branch. As the goal is to work
from a single branch for all IA BSPs, this is a first step
toward purging the IA BSP branches from linux-yocto.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../kernel-cache/bsp/minnow/minnow-preempt-rt.scc  |    1 -
 .../kernel-cache/bsp/minnow/minnow-standard.scc    |    1 -
 meta/cfg/kernel-cache/bsp/minnow/minnow-tiny.scc   |    1 -
 3 files changed, 3 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/minnow/minnow-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/minnow/minnow-preempt-rt.scc
index 38cd9f9..b5c7b50 100644
--- a/meta/cfg/kernel-cache/bsp/minnow/minnow-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/minnow/minnow-preempt-rt.scc
@@ -4,7 +4,6 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
-branch minnow
 
 include minnow.scc
 
diff --git a/meta/cfg/kernel-cache/bsp/minnow/minnow-standard.scc b/meta/cfg/kernel-cache/bsp/minnow/minnow-standard.scc
index 2817bab..a7a87d5 100644
--- a/meta/cfg/kernel-cache/bsp/minnow/minnow-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/minnow/minnow-standard.scc
@@ -3,7 +3,6 @@ define KTYPE standard
 define KARCH i386
 
 include ktypes/standard
-branch minnow
 
 include minnow.scc
 
diff --git a/meta/cfg/kernel-cache/bsp/minnow/minnow-tiny.scc b/meta/cfg/kernel-cache/bsp/minnow/minnow-tiny.scc
index 750b99a..97fc668 100644
--- a/meta/cfg/kernel-cache/bsp/minnow/minnow-tiny.scc
+++ b/meta/cfg/kernel-cache/bsp/minnow/minnow-tiny.scc
@@ -3,6 +3,5 @@ define KTYPE tiny
 define KARCH i386
 
 include ktypes/tiny
-branch minnow
 
 include minnow.scc
-- 
1.7.9.5




More information about the linux-yocto mailing list