release.sh: restore -jJAILDIR option
. also make copying a bit more informative and succinct
This commit is contained in:
parent
ffdb12bc9b
commit
4c3a751f9b
|
@ -48,7 +48,6 @@ set -- $* $RELOPTS
|
||||||
|
|
||||||
export RELEASEDIR=/usr/r-staging
|
export RELEASEDIR=/usr/r-staging
|
||||||
RELEASEMNTDIR=/usr/r
|
RELEASEMNTDIR=/usr/r
|
||||||
RELEASEPACKAGE=${RELEASEDIR}/usr/install/packages
|
|
||||||
|
|
||||||
IMAGE=/usr/mdec/bootxx_cd9660
|
IMAGE=/usr/mdec/bootxx_cd9660
|
||||||
ROOTIMAGE=rootimage
|
ROOTIMAGE=rootimage
|
||||||
|
@ -130,6 +129,8 @@ do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
RELEASEPACKAGE=${RELEASEDIR}/usr/install/packages
|
||||||
|
|
||||||
if [ $GITMODE -ne 1 -a $COPY -ne 1 ]
|
if [ $GITMODE -ne 1 -a $COPY -ne 1 ]
|
||||||
then echo "Need git to retrieve latest minix! Copying src instead!"
|
then echo "Need git to retrieve latest minix! Copying src instead!"
|
||||||
COPY=1
|
COPY=1
|
||||||
|
@ -205,10 +206,12 @@ then
|
||||||
IMG=${IMG_BASE}_${DATE}_${REVTAG}.iso
|
IMG=${IMG_BASE}_${DATE}_${REVTAG}.iso
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
echo "First cleaning current sourcedir.."
|
||||||
|
( cd .. && make cleandir >/dev/null )
|
||||||
echo "Copying contents from current src dir."
|
echo "Copying contents from current src dir."
|
||||||
( cd .. && make cleandir )
|
|
||||||
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 .svn -cf - . ) | ( cd $RELEASEDIR/usr && mkdir $SRC && cd $SRC && tar xf - )
|
||||||
|
echo "Copying done."
|
||||||
REVTAG=copy
|
REVTAG=copy
|
||||||
REVISION=unknown
|
REVISION=unknown
|
||||||
IMG=${IMG_BASE}_copy.iso
|
IMG=${IMG_BASE}_copy.iso
|
||||||
|
|
Loading…
Reference in a new issue