From b648da01d759c5176c78a77a6ba5e8d17d6953d5 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 8 Jun 2007 11:21:21 +0000 Subject: [PATCH] Tag of 3.1.3a, an incremental release of 3.1.3. --- commands/dhcpd/devices.c | 4 +++- tools/release.sh | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/commands/dhcpd/devices.c b/commands/dhcpd/devices.c index 3d12a1648..2ff4f22e6 100755 --- a/commands/dhcpd/devices.c +++ b/commands/dhcpd/devices.c @@ -174,7 +174,9 @@ int opendev(network_t *np, fdtype_t fdtype, int compete) switch (fdtype) { case FT_ETHERNET: /* Set NONBLOCK to avoid waiting for a device driver to become ready */ - fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) | O_NONBLOCK); + /* Outcommented again to make the orinoco driver work. See doc of + orinoco */ + fcntl(np->fdp->fd, F_SETFL, fcntl(np->fdp->fd, F_GETFL) /*| O_NONBLOCK*/); if (ioctl(np->fdp->fd, NWIOGETHSTAT, ðstat) < 0) { /* Not an Ethernet. */ close(fdp->fd); diff --git a/tools/release.sh b/tools/release.sh index ee6822534..6a932c67b 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -133,7 +133,7 @@ do esac done -USRMB=400 +USRMB=650 USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`" USRSECTS="`expr $USRMB \* 1024 \* 2`" @@ -286,10 +286,11 @@ chmod -R u+w $RELEASEDIR/usr/lib if [ "$COPY" -ne 1 ] then echo " * Doing new svn export" - REPO=https://gforge.cs.vu.nl/svn/minix/trunk/$SRC + REPO="`cd ../ && svn info | grep '^URL: ' | awk '{ print $2 }'`" + DIRNAME=`basename $REPO` REVISION="`svn info $USERNAME $SVNREV $REPO | grep '^Revision: ' | awk '{ print $2 }'`" echo "Doing export of revision $REVISION from $REPO." - ( cd $RELEASEDIR/usr && svn $USERNAME export -r$REVISION $REPO ) + ( cd $RELEASEDIR/usr && svn $USERNAME export -r$REVISION $REPO && mv $DIRNAME $SRC ) REVTAG=r$REVISION echo " -- 2.44.0