X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=1a44add7102b3a814275bec9a4bbaac0f50c118d;hp=f5947ea24d532b0b26851c6a0b6985c4869b2077;hb=505b7e938fb5391800daf463d6a98551dac668b1;hpb=e8b7789107108bedec9d62fa67b337983054fa39

diff --git a/make.sh b/make.sh
index f5947ea24d..1a44add710 100755
--- 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="29"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -595,7 +595,7 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  ipfiremake cryptsetup
+  #ipfiremake cryptsetup
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
@@ -612,6 +612,11 @@ buildipfire() {
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
+  ipfiremake cacti
+  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
@@ -621,6 +626,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() {
@@ -694,6 +700,7 @@ buildpackages() {
   # 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
@@ -985,52 +992,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