summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2016-03-15 10:55:23 +1100
committerChris Johns <chrisj@rtems.org>2016-03-16 06:04:37 +1100
commit84ed68588b4dfb241f0933a9b48c68626247887e (patch)
tree547348a9ffd1efaf02668b79af4c2564b3447576
parentrtems-kernel: Fix the --with-rtems/--without-rtems support when released. (diff)
downloadrtems-source-builder-84ed68588b4dfb241f0933a9b48c68626247887e.tar.bz2
sb: Make cvs optional.
Ignore RSB generated files to keep the git dirty status clean. Closes #2647. Closes #2748.
-rw-r--r--.gitignore1
-rw-r--r--source-builder/sb/darwin.py2
-rw-r--r--source-builder/sb/solaris.py2
-rw-r--r--source-builder/sb/windows.py2
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'),