[rtems-source-builder commit] sb: Make cvs optional.

Chris Johns chrisj at rtems.org
Tue Mar 15 19:04:48 UTC 2016


Module:    rtems-source-builder
Branch:    4.11
Commit:    84ed68588b4dfb241f0933a9b48c68626247887e
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=84ed68588b4dfb241f0933a9b48c68626247887e

Author:    Chris Johns <chrisj at rtems.org>
Date:      Tue Mar 15 10:55:23 2016 +1100

sb: Make cvs optional.

Ignore RSB generated files to keep the git dirty status clean.

Closes #2647.
Closes #2748.

---

 .gitignore                   | 1 +
 source-builder/sb/darwin.py  | 2 +-
 source-builder/sb/solaris.py | 2 +-
 source-builder/sb/windows.py | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd85e30..1fe2766 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 VERSION
+rsb-*.txt
diff --git a/source-builder/sb/darwin.py b/source-builder/sb/darwin.py
index 91438b7..102b104 100644
--- a/source-builder/sb/darwin.py
+++ b/source-builder/sb/darwin.py
@@ -52,7 +52,7 @@ def load():
         '_var':             ('dir',     'optional', '/usr/local/var'),
         '_prefix':          ('dir',     'optional', '%{_usr}'),
         '__ldconfig':       ('exe',     'none',     ''),
-        '__cvs':            ('exe',     'required', 'cvs'),
+        '__cvs':            ('exe',     'optional', 'cvs'),
         '__xz':             ('exe',     'required', '%{_usr}/bin/xz'),
         'with_zlib':        ('none',    'none',     '--with-zlib=no'),
         '_forced_static':   ('none',    'none',     ''),
diff --git a/source-builder/sb/solaris.py b/source-builder/sb/solaris.py
index 13401d5..8d9498a 100644
--- a/source-builder/sb/solaris.py
+++ b/source-builder/sb/solaris.py
@@ -61,7 +61,7 @@ def load():
         '__bison':          ('exe',     'required', '/usr/bin/bison'),
         '__git':            ('exe',     'required', '/usr/bin/git'),
         '__svn':            ('exe',     'required', '/usr/bin/svn'),
-        '__cvs':            ('exe',     'required', '/usr/bin/cvs'),
+        '__cvs':            ('exe',     'optional', '/usr/bin/cvs'),
         '__xz':             ('exe',     'optional', '/usr/bin/xz'),
         '__make':           ('exe',     'required', 'gmake'),
         '__patch_opts':     ('none',     'none',    '-E'),
diff --git a/source-builder/sb/windows.py b/source-builder/sb/windows.py
index 5e732b5..53a47ac 100644
--- a/source-builder/sb/windows.py
+++ b/source-builder/sb/windows.py
@@ -96,7 +96,7 @@ def load():
         '__chmod':           ('exe',     'required', 'chmod'),
         '__chown':           ('exe',     'required', 'chown'),
         '__cp':              ('exe',     'required', 'cp'),
-        '__cvs':             ('exe',     'required', 'cvs'),
+        '__cvs':             ('exe',     'optional', 'cvs'),
         '__cxx':             ('exe',     'required', 'g++'),
         '__flex':            ('exe',     'required', 'flex'),
         '__git':             ('exe',     'required', 'git'),




More information about the vc mailing list