No more -a; no more contrib

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 4c6967c9b45e5ee28f29f2e5e63487c0307ad60d..4afb9ba5139626eec81ed0b1a9ae7621af936914 100755 (executable)
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -18,6 +18,5 @@ su bin -c 'makewhatis /usr/man'
 su bin -c 'makewhatis /usr/gnu/man'
 su bin -c 'makewhatis /usr/local/man'
 mv /usr/src/commands /usr/src.commands
-mv /usr/src/contrib /usr/src.contrib
 exit 0
 

diff --git a/tools/release.sh b/tools/release.sh
index 4e28b98edfa44ebd2f10cd4e1fa293f1f2e59efe..36a76f8a98ad320cbe32dece280fc37a255b05c6 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -68,7 +68,6 @@ BS=4096
 
 HDEMU=0
 COPY=0
-ALL=0
 QUICK=0
 
 while getopts "chaq?" c
@@ -86,10 +85,6 @@ do
                echo " * Copying, not CVS"
                COPY=1
                ;;
-       a)
-               echo " * Including contrib"
-               ALL=1
-               ;;
        q)
                echo " * Quick option (skip important bits"
                QUICK=1
@@ -178,28 +173,13 @@ then
        if [ "$COPY" -ne 1 ]
        then
                echo " * Doing new cvs export"
-               if [ "$ALL" = 0 ]
-               then
-                       cvs export -rHEAD src >/dev/null || exit 1
-                       srcdir=src
-                       # No contrib stuff
-                       rm -rf src/contrib
-                       echo " * Transfering source to $RELEASEDIR"
-                       ( cd $srcdir && tar cf - . ) | ( cd $RELEASEDIR/usr && mkdir src && cd src && tar xf - )
-               else
-                       ( cd $RELEASEDIR/usr && mkdir src && cvs export -rHEAD src )
-               fi
+               ( cd $RELEASEDIR/usr && mkdir src && cvs export -rHEAD src )
        else
                ( cd .. && make clean )
                srcdir=/usr/src
                ( cd $srcdir && tar cf - . ) | ( cd $RELEASEDIR/usr && mkdir src && cd src && tar xf - )
        fi
 
-       if [ "$ALL" = 0 ]
-       then    echo " * Removing temporary cvs source tree"
-               rm -rf src
-       fi
-
        echo " * Fixups for owners and modes of dirs and files"
        chown -R bin $RELEASEDIR/usr/src
        find $RELEASEDIR/usr/src -type d | xargs chmod 755