On Sat, Aug 13, 2011 at 9:09 AM, Garrett Cooper <yaneg...@gmail.com> wrote:
> On Sat, Aug 13, 2011 at 8:37 AM, eculp <ec...@encontacto.net> wrote:
>> I've been building a release about once a week on current. The last
>> successful build was on august 8 but don't know when this started but in the
>> last few days.
>>
>> I am building on
>> # uname -a
>> FreeBSD Home.EnContacto.net 9.0-BETA1 FreeBSD 9.0-BETA1 #16: Sat Aug 13
>> 05:09:17 CDT 2011
>> r...@home.encontacto.net:/usr/obj/usr/src/sys/ENCONTACTO amd64
>>
>> All builds include ports kernel updated ports, etc. I build it with
>> generate-release.sh script below.
>>
>> sh generate-release.sh head /local3/release
>
> Please try the attached patch.
This will work better.
Thanks,
-Garrett
Index: release/generate-release.sh
===================================================================
--- release/generate-release.sh (revision 224801)
+++ release/generate-release.sh (working copy)
@@ -20,11 +20,20 @@
# $FreeBSD$
#
+if [ $# -ne 2 ]; then
+ echo >&2 "usage: $(dirname "$0") svn-branch scratch-dir"
+ exit 1
+fi
+
+if [ -d $2 ]; then
+ rm -Rf $2; chflags -R noschg $2; rm -Rf $2
+fi
+
+set -e # Everything must succeed
mkdir -p $2/usr/src
-set -e # Everything must succeed
svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src
-if [ ! -z $CVSUP_HOST ]; then
+if [ -n "$CVSUP_HOST" ]; then
cat > $2/docports-supfile << EOF
*default host=$CVSUP_HOST
*default base=/var/db
@@ -35,7 +44,7 @@
ports-all
doc-all
EOF
-elif [ ! -z $CVSROOT ]; then
+elif [ -n "$CVSROOT" ]; then
cd $2/usr
cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports
cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc
@@ -47,7 +56,7 @@
mount -t devfs devfs $2/dev
trap "umount $2/dev" EXIT # Clean up devfs mount on exit
-if [ ! -z $CVSUP_HOST ]; then
+if [ -n "$CVSUP_HOST" ]; then
cp /etc/resolv.conf $2/etc/resolv.conf
# Checkout ports and doc trees
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
