Fix network assignment on ct'server image

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

diff --git a/make.sh b/make.sh
index 8ba3cdbc695d22f53826a784ff09368944022cb9..0eeb8978cc1c92709bd8d6fd524a6e6a6c741c6a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.5beta2"
-CORE="28"
+VERSION="2.5"
+CORE="30"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -340,6 +340,8 @@ buildipfire() {
   ipfiremake which
   ipfiremake linux                     XEN=1
   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,6 +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
@@ -622,6 +631,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
 }
 
 buildinstaller() {
@@ -691,16 +701,25 @@ buildpackages() {
 
   # Create images for install
        ipfiremake cdrom ED=$IPFVER
-       
+
   # Check if there is a loop device for building in virtual environments
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick ED=$IPFVER
+       ipfiremake flash-images ED=$IPFVER
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
 
+  # Check if there is a loop device for building in virtual environments
+  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+       ipfiremake xen-image ED=$IPFVER
+       rm -rf $LFS/install/packages/linux-xen-*.ipfire
+  fi
+  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -986,52 +1005,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