Some features for the automatic image build.

This commit is contained in:
Ben Gras 2007-04-18 11:42:48 +00:00
parent 673c7ced15
commit 365e867a88

View File

@ -95,11 +95,13 @@ SVNREV=""
REVTAG="" REVTAG=""
PACKAGES=1 PACKAGES=1
while getopts "pchu?r:" c FILENAMEOUT=""
while getopts "s:pchu?r:f:" c
do do
case "$c" in case "$c" in
\?) \?)
echo "Usage: $0 [-p] [-c] [-h] [-r <tag>] [-u]" >&2 echo "Usage: $0 [-p] [-c] [-h] [-r <tag>] [-u] [-f <filename>] [-s <username>]" >&2
exit 1 exit 1
;; ;;
h) h)
@ -123,6 +125,11 @@ do
HDEMU=1 HDEMU=1
USB=1 USB=1
;; ;;
f)
FILENAMEOUT="$OPTARG"
;;
s) USERNAME="--username=$OPTARG"
;;
esac esac
done done
@ -214,7 +221,7 @@ then
fi fi
echo " * Cleanup old files" echo " * Cleanup old files"
rm -rf $RELEASEDIR $IMG $IMAGE $ROOTIMAGE $IMGBZ $CDFILES image* rm -rf $RELEASEDIR $IMG $IMAGE $ROOTIMAGE $CDFILES image*
mkdir -p $CDFILES || exit mkdir -p $CDFILES || exit
mkdir -p $RELEASEDIR mkdir -p $RELEASEDIR
mkfs -B $BS -b $ROOTBLOCKS $TMPDISK3 || exit mkfs -B $BS -b $ROOTBLOCKS $TMPDISK3 || exit
@ -280,9 +287,9 @@ if [ "$COPY" -ne 1 ]
then then
echo " * Doing new svn export" echo " * Doing new svn export"
REPO=https://gforge.cs.vu.nl/svn/minix/trunk/$SRC REPO=https://gforge.cs.vu.nl/svn/minix/trunk/$SRC
REVISION="`svn info $SVNREV $REPO | grep '^Revision: ' | awk '{ print $2 }'`" REVISION="`svn info $USERNAME $SVNREV $REPO | grep '^Revision: ' | awk '{ print $2 }'`"
echo "Doing export of revision $REVISION from $REPO." echo "Doing export of revision $REVISION from $REPO."
( cd $RELEASEDIR/usr && svn export -r$REVISION $REPO ) ( cd $RELEASEDIR/usr && svn $USERNAME export -r$REVISION $REPO )
REVTAG=r$REVISION REVTAG=r$REVISION
echo " echo "
@ -303,8 +310,6 @@ if [ "$USB" -ne 0 ]; then
else else
IMG=${IMG_BASE}_${REVTAG}.iso IMG=${IMG_BASE}_${REVTAG}.iso
fi fi
IMGBZ=${IMG}.bz2
echo "Making $IMGBZ"
echo " * Fixups for owners and modes of dirs and files" echo " * Fixups for owners and modes of dirs and files"
chown -R bin $RELEASEDIR/usr/$SRC chown -R bin $RELEASEDIR/usr/$SRC
@ -403,3 +408,7 @@ else
partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS
fi fi
fi fi
if [ "$FILENAMEOUT" ]
then echo "$IMG" >$FILENAMEOUT
fi