Update:

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index d7effc78d96691f2281024517adf117a0e6faee3..9fdf9fd7f730e5e3ea43e0d6b3dbcc6494cf9a92 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -733,7 +733,10 @@ buildipcop() {
   ipcopmake asterisk
   ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake asterisk
   ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE

+  ipcopmake libogg
+  ipcopmake libvorbis

   ipcopmake lame
   ipcopmake lame

+  ipcopmake sox

   ipcopmake gnump3d
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake gnump3d
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice


@@ -868,7 +871,7 @@ ipfirepackages() {
   fi
   ipfiredist amavisd
   ipfiredist applejuice
   fi
   ipfiredist amavisd
   ipfiredist applejuice

-  # ipfiredist asterisk
+  ipfiredist asterisk

   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrusimap


@@ -889,7 +892,7 @@ ipfirepackages() {
   ipfiredist spamassassin
   ipfiredist web-cyradm
   ipfiredist xampp
   ipfiredist spamassassin
   ipfiredist web-cyradm
   ipfiredist xampp

-  ipfiredist xinetd
+#  ipfiredist xinetd

   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*


@@ -1134,6 +1137,17 @@ gettoolchain)
                echo "Toolchain is already downloaded. Exiting..."
        fi
        ;;
                echo "Toolchain is already downloaded. Exiting..."
        fi
        ;;

+sources-iso)
+       prepareenv
+       echo "`date -u '+%b %e %T'`: Build sources iso for $MACHINE" | tee -a $LOGFILE
+       chroot $LFS /tools/bin/env -i   HOME=/root \
+       TERM=$TERM PS1='\u:\w\$ ' \
+       PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+       VERSION=$VERSION NAME="$NAME" SNAME="$SNAME" MACHINE=$MACHINE \
+       /bin/bash -x -c "cd /usr/src/lfs && make -f sources-iso LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
+       mv $LFS/install/images/ipfire-* $BASEDIR >> $LOGFILE 2>&1
+       stdumount
+       ;;

 svn)
        case "$2" in
          update|up)
 svn)
        case "$2" in
          update|up)


@@ -1159,8 +1173,8 @@ svn)
          ;;
          commit|ci)
                clear
          ;;
          commit|ci)
                clear

-               $0 changelog
-               echo "Upload the changed files..."
+               #$0 changelog
+               #echo "Upload the changed files..."

                sleep 1
                svn commit
                $0 svn up
                sleep 1
                svn commit
                $0 svn up


@@ -1296,7 +1310,7 @@ END
        ;;
 sync)
        echo -e "Syncing cache to ftp:"
        ;;
 sync)
        echo -e "Syncing cache to ftp:"

-       rm -f doc/packages-to-remove-from-ftp
+#      rm -f doc/packages-to-remove-from-ftp

        ncftpls -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT ftp://$IPFIRE_FTP_URL_INT$IPFIRE_FTP_PATH_INT/ > ftplist
        for i in `ls -w1 cache/`; do
                grep $i ftplist
        ncftpls -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT ftp://$IPFIRE_FTP_URL_INT$IPFIRE_FTP_PATH_INT/ > ftplist
        for i in `ls -w1 cache/`; do
                grep $i ftplist


@@ -1309,12 +1323,12 @@ sync)
                        fi
                fi
        done
                        fi
                fi
        done

-       for i in `cat ftplist`; do
-               ls -w1 cache/ | grep $i
-               if [ "$?" -eq "1" ]; then
-                       echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
-               fi
-       done
+#      for i in `cat ftplist`; do
+#              ls -w1 cache/ | grep $i
+#              if [ "$?" -eq "1" ]; then
+#                      echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
+#              fi
+#      done

        rm -f ftplist
        ;;
 upload)
        rm -f ftplist
        ;;
 upload)


@@ -1484,6 +1498,9 @@ unattended)
        echo "### SAVING TIME"
        export IPFIRE_START_TIME=`date`
 
        echo "### SAVING TIME"
        export IPFIRE_START_TIME=`date`
 

+       echo "### GETTING TOOLCHAIN"
+       $0 gettoolchain
+

        echo "### RUNNING SVN-UPDATE"
        $0 svn update
        if [ $? -ne 0 ]; then
        echo "### RUNNING SVN-UPDATE"
        $0 svn update
        if [ $? -ne 0 ]; then


@@ -1512,6 +1529,9 @@ unattended)
                exit 1
        fi
 
                exit 1
        fi
 

+       echo "### MAKING SOURCES-ISO"
+       $0 sources-iso
+

        echo "### UPLOADING ISO"
        $0 upload iso
        if [ $? -ne 0 ]; then
        echo "### UPLOADING ISO"
        $0 upload iso
        if [ $? -ne 0 ]; then


@@ -1580,7 +1600,10 @@ batch)
                $0 clean
                ;;
        "SVN: Commit")
                $0 clean
                ;;
        "SVN: Commit")

-               $0 svn commit
+               echo "Are your sure to Update all Files to the Server (write: yes)?"; read input
+               if [ "$input" == "yes" ]; then
+                       $0 svn commit
+               fi

                ;;
        "SVN: Update")
                $0 svn update
                ;;
        "SVN: Update")
                $0 svn update