. 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 543810de78654661c616bfb07f847c49d93b9ef8..361bd08adb5508ad321ffd1199f1df091de546c2 100755 (executable)
--- 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 34713363f3945d86ba05a31b8ba0fb6a6cc30d8d..0d5e40a4b1711f26c40e4fe0d23c48128cd14034 100755 (executable)
--- 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