Updated High-Speed Option (hso) to 1.9.

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

diff --git a/make.sh b/make.sh
index 9da9a16879aebd8fedfe6d8b337e8ed8da767044..ab5a40fa807887e25d4214bc0ea81664d2b51c68 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.5"
-CORE="28"
+CORE="30"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -338,8 +338,10 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux                     XEN=1
+  ipfiremake linux-xen
   ipfiremake atl2                      XEN=1
+  ipfiremake hso                       XEN=1
+  ipfiremake e1000e                    XEN=1
   ipfiremake kqemu                     XEN=1
   ipfiremake v4l-dvb                   XEN=1
   ipfiremake madwifi                   XEN=1
@@ -349,6 +351,8 @@ buildipfire() {
   ipfiremake compat-wireless           XEN=1
   ipfiremake linux
   ipfiremake atl2
+  ipfiremake hso
+  ipfiremake e1000e
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
@@ -613,9 +617,11 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
   ipfiremake cacti
+  ipfiremake icecc
   ipfiremake open-vm-tools
   ipfiremake nagiosql
   ipfiremake iftop
+  ipfiremake motion
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -991,52 +997,6 @@ uploadsrc)
        cd $PWD
        exit 0
        ;;
-upload)
-       FTP_ISO_PORT=`echo "$FTP_ISO_URL" | awk -F: '{ print $2 }'`
-       FTP_ISO_URL=`echo "$FTP_ISO_URL" | awk -F: '{ print $1 }'`
-       if [ -z $FTP_ISO_PORT ]; then
-           FTP_ISO_PORT=21
-       fi
-       cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH$SVN_REVISION
-mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
-quit
-EOF
-       ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL < .ftp-commands
-       rm -f .ftp-commands
-               
-       case "$2" in
-         iso)
-               echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
-
-               md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5
-               for i in svn_status ipfire-source-r$SVN_REVISION.tar.gz ipfire-$VERSION.$MACHINE-full.iso ipfire-$VERSION.$MACHINE-full.iso.md5 ipfire-$VERSION.$MACHINE-devel.iso ipfire-$VERSION.$MACHINE-devel.iso.md5; do
-                               if [ -e "$i" ]; then
-                           ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ $i
-                                       if [ "$?" -eq "0" ]; then
-                                               echo "The file with name $i was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
-                                       else
-                                               echo "There was an error while uploading the file $i to the ftp server."
-                                               exit 1
-                                       fi
-                               fi
-               done
-               rm -f ipfire-$VERSION.$MACHINE-full.iso.md5
-               if [ "$3" = "--with-sources-cd" ]; then
-                       ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
-               fi
-               ;;
-         paks)
-               ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/*
-               if [ "$?" -eq "0" ]; then
-                       echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
-               else
-                       echo -e "There was an error while uploading the packages to the ftp server."
-                       exit 1
-               fi
-         ;;
-       esac
-       ;;
 batch)
        if [ "$2" = "--background" ]; then
                batch_script