release: can specify branch

This commit is contained in:
Ben Gras 2012-02-20 23:46:01 +01:00
parent 230ea1ce13
commit a953da6e10

View file

@ -11,6 +11,7 @@ PACKAGEDIR=/usr/pkgsrc/packages/$version_pretty/`uname -m`
XBIN=usr/xbin XBIN=usr/xbin
SRC=src SRC=src
REPO=git://git.minix3.org/minix REPO=git://git.minix3.org/minix
GITBRANCH=master
# List of packages included on installation media # List of packages included on installation media
PACKAGELIST=packages.install PACKAGELIST=packages.install
@ -81,13 +82,16 @@ fi
FILENAMEOUT="" FILENAMEOUT=""
while getopts "j:ls:pmMchu?r:f:L:e:" c while getopts "b:j:ls:pmMchu?r:f:L:e:" c
do do
case "$c" in case "$c" in
\?) \?)
echo "Usage: $0 [-l] [-p] [-c] [-h] [-m] [-M] [-r <tag>] [-u] [-f <filename>] [-s <username>] -j<jaildir> [-L <packageurl>] [-e <extras-path>]" >&2 echo "Usage: $0 [-l] [-p] [-c] [-h] [-m] [-M] [-r <tag>] [-u] [-f <filename>] [-s <username>] -j<jaildir> [-L <packageurl>] [-e <extras-path>]" >&2
exit 1 exit 1
;; ;;
b)
GITBRANCH=$OPTARG
;;
h) h)
echo " * Making HD image" echo " * Making HD image"
IMG_BASE=minix${version}_bios IMG_BASE=minix${version}_bios
@ -196,9 +200,9 @@ copy_local_packages
if [ "$COPY" -ne 1 ] if [ "$COPY" -ne 1 ]
then then
echo "Retrieving latest minix repo from $REPO." echo "Retrieving latest minix repo from $REPO branch $GITBRANCH."
srcdir=$RELEASEDIR/usr/src srcdir=$RELEASEDIR/usr/src
git clone $REPO $srcdir git clone -b $GITBRANCH $REPO $srcdir
if [ "$REVTAG" ] if [ "$REVTAG" ]
then echo "Doing checkout of $REVTAG." then echo "Doing checkout of $REVTAG."
(cd $srcdir && git checkout $REVTAG ) (cd $srcdir && git checkout $REVTAG )