From: Ben Gras Date: Wed, 24 Aug 2005 16:49:09 +0000 (+0000) Subject: . Makefile fix to make releasing work again (drivers weren't built) X-Git-Tag: v3.1.0~293 X-Git-Url: http://zhaoyanbai.com/repos/dnssec-revoke.html?a=commitdiff_plain;h=8a149da39415cd0b5393ae35ccc51e71718ab401;p=minix.git . Makefile fix to make releasing work again (drivers weren't built) . release -c feature: copy instead of cvs export --- diff --git a/tools/Makefile b/tools/Makefile index 543810de7..361bd08ad 100755 --- a/tools/Makefile +++ b/tools/Makefile @@ -53,7 +53,7 @@ fresh: $(MAKE) clean $(MAKE) libraries services -all: image +all: services image image: includes cd ../kernel && $(MAKE) diff --git a/tools/release.sh b/tools/release.sh index 34713363f..0d5e40a4b 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -65,22 +65,31 @@ ROOTMB=2 ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`" HDEMU=0 +COPY=0 -while getopts "h?" c +while getopts "ch?" c do case "$c" in \?) - echo "Usage: $0 [-h]" >&2 + echo "Usage: $0 [-c] [-h]" >&2 exit 1 ;; h) HDEMU=1 + ;; + c) + COPY=1 + ;; esac done -echo "Note: this script wants to do cvs operations, so it's necessary" -echo "to have \$CVSROOT set and cvs login done." -echo "" +if [ "$COPY" -ne 1 ] +then + echo "Note: this script wants to do cvs operations, so it's necessary" + echo "to have \$CVSROOT set and cvs login done." + echo "" +fi + echo "Warning: I'm going to mkfs $RAM! It has to be at least $ROOTMB MB." echo "" echo "Temporary (sub)partition to use to make the /usr FS image? " @@ -119,8 +128,17 @@ mkdir -p $RELEASEDIR/tmp mkdir -p $RELEASEDIR/usr/tmp echo " * Transfering $COPYITEMS to $RELEASEDIR" ( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1 -echo " * Doing new cvs export" -( cd $RELEASEDIR/usr && mkdir src && cvs export -rHEAD src >/dev/null 2>&1 || exit 1 ) + +if [ "$COPY" -ne 1 ] +then + echo " * Doing new cvs export" + ( cd $RELEASEDIR/usr && mkdir src && cvs export -rHEAD src >/dev/null 2>&1 || exit 1 ) +else + ( cd .. && make clean ) + echo " * Transfering source to $RELEASEDIR" + ( cd /usr && tar cf - src ) | ( cd $RELEASEDIR/usr && tar xf - ) +fi + chown -R bin $RELEASEDIR/usr/src find $RELEASEDIR/usr/src -type d | xargs chmod 755 find $RELEASEDIR/usr/src -type f | xargs chmod 644