=================================================================== RCS file: /cvs/openbsd/update_openbsd/release.sh,v retrieving revision 1.6 retrieving revision 1.10 diff -u -r1.6 -r1.10 --- openbsd/update_openbsd/release.sh 2006/11/07 17:09:19 1.6 +++ openbsd/update_openbsd/release.sh 2007/05/04 21:56:34 1.10 @@ -1,5 +1,5 @@ #!/bin/sh -# $RedRiver: release.sh,v 1.5 2006/10/13 18:18:51 andrew Exp $ +# $RedRiver: release.sh,v 1.9 2006/12/13 23:26:56 andrew Exp $ # Copyright (c) 2002 - 2006, FenderQ # All rights reserved. # @@ -38,10 +38,10 @@ DEST="/usr/dest" RELEASE="/usr/release" -CVSTAG=`uname -r | awk '{ sub("\\\.","_"); print "OPENBSD_" $0 }'` +CVSTAG=${CVSTAG:=`uname -sr | tr '[:lower:] .' '[:upper:]_'`} #SOURCES="src ports XF4" #SOURCES="src ports" -SOURCES="src XF4" +SOURCES="src ports XF4" # Anonymous CVS - http://www.openbsd.org/anoncvs.html CVSROOT="anoncvs@anoncvs3.usa.openbsd.org:/cvs" @@ -59,7 +59,11 @@ update_sources() { echo "********** Update sources **********" for d in $SOURCES; do - cd /usr && cvs -q -z6 update -r$CVSTAG -Pd $d + _cvstag=-r$CVSTAG + if [ X"$CVSTAG" == X"HEAD" ]; then + _cvstag=-A + fi + cd /usr && cvs -q -z6 update $_cvstag -Pd $d done } @@ -88,6 +92,7 @@ mkdir -p $DESTDIR $RELEASEDIR cd /usr/src/etc && nice make release cd /usr/src/distrib/sets && sh checkflist + ls $RELEASEDIR | grep -v index.txt | sort > $RELEASEDIR/index.txt unset DESTDIR RELEASEDIR } @@ -107,6 +112,7 @@ mkdir -p $DESTDIR $RELEASEDIR cd /usr/Xbuild && nice make release cd /usr/Xbuild/distrib/sets && sh checkflist + ls $RELEASEDIR | grep -v index.txt | sort > $RELEASEDIR/index.txt unset DESTDIR RELEASEDIR }