sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

release.sh: SVN to GIT updates

Browse source 
- exclude .git instead of .svn when using local source (-c);
- put the git tag (or "copy") in /etc/version rather than something
  outdated related to SVN;
- remove SVN-specific -s flag (suggested by Erik).

Change-Id: Ia35eb95c39ae93ebae5638c9dd7847428593b813
This commit is contained in:
David van Moolenbroek 2013-10-11 20:38:45 +02:00
parent eafe5cb04a
commit be22a5eeee
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
releasetools/release.sh
View file

@ -75,11 +75,11 @@ fi
FILENAMEOUT="" FILENAMEOUT=""
while getopts "b:j:ls:pmMch?f:L:e:" c while getopts "b:j:lpmMch?f:L:e:" c
do do
case "$c" in case "$c" in
\?) \?)
echo "Usage: $0 [-l] [-p] [-c] [-m] [-M] [-f <filename>] [-s <username>] -j<jaildir> [-L <packageurl>] [-e <extras-path>]" >&2 echo "Usage: $0 [-l] [-p] [-c] [-m] [-M] [-f <filename>] -j<jaildir> [-L <packageurl>] [-e <extras-path>]" >&2
exit 1 exit 1
;; ;;
b) b)
@ -99,8 +99,6 @@ do
f) f)
FILENAMEOUT="$OPTARG" FILENAMEOUT="$OPTARG"
;; ;;
s) USERNAME="--username=$OPTARG"
;;
m) MINIMAL=1 m) MINIMAL=1
PACKAGES=0 PACKAGES=0
;; ;;
@ -194,10 +192,9 @@ else
( cd .. && make cleandir >/dev/null ) ( cd .. && make cleandir >/dev/null )
echo "Copying contents from current src dir." echo "Copying contents from current src dir."
srcdir=/usr/$SRC srcdir=/usr/$SRC
( cd $srcdir && tar --exclude .svn -cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - ) ( cd $srcdir && tar --exclude .git -cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - )
echo "Copying done." echo "Copying done."
REVTAG=copy REVTAG=copy
REVISION=unknown
IMG=${IMG_BASE}_copy.iso IMG=${IMG_BASE}_copy.iso
fi fi
@ -244,7 +241,7 @@ echo " * Removing bootstrap files"
chown -R root $RELEASEDIR/usr/src* chown -R root $RELEASEDIR/usr/src*
cp issue.install $RELEASEDIR/etc/issue cp issue.install $RELEASEDIR/etc/issue
echo $version_pretty, SVN revision $REVISION, generated `date` >$RELEASEDIR/etc/version echo $version_pretty, GIT revision $REVTAG, generated `date` >$RELEASEDIR/etc/version
rm -rf $RELEASEDIR/tmp/* rm -rf $RELEASEDIR/tmp/*
if [ $MINIMAL -ne 0 ] if [ $MINIMAL -ne 0 ]