X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=66e821ff284b8eb851c776efd6dc98b5ad18d98c;hp=91f976d561c2f5c16d36eb0d6c26c6b0f58051f0;hb=8b0883b87761356242bc35e68d1dae3b4f55b755;hpb=8af06406327d31b65d73a915332296d9a552c92f

diff --git a/make.sh b/make.sh
index 91f976d561..66e821ff28 100644
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 
   NAME="IPFire"			# Software name
   SNAME="ipfire"			# Short name
-  VERSION="1.4"			# Version number
+  VERSION="2.0"			# Version number
   SLOGAN="We secure your network"	# Software slogan
   CONFIG_ROOT=/var/ipfire		# Configuration rootdir
   NICE=10
@@ -551,6 +551,7 @@ buildipcop() {
 	ipcopmake fcclassic	SMP=1
 	ipcopmake pulsar 	SMP=1
   	ipcopmake unicorn 	SMP=1
+  	ipcopmake promise-sata-300-tx SMP=1
   fi
 
   ipcopmake linux	LFS_PASS=ipfire
@@ -571,8 +572,9 @@ buildipcop() {
  	ipcopmake fcdslslusb 
   	ipcopmake fcpci
   	ipcopmake fcclassic
-	ipcopmake pulsar 	
-  	ipcopmake unicorn 	
+	ipcopmake pulsar	
+  	ipcopmake unicorn
+  	ipcopmake promise-sata-300-tx
   fi
 
   ipcopmake pcmcia-cs
@@ -700,13 +702,14 @@ buildipcop() {
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
-  ipcopmake pwlib
-  ipcopmake openh323
+#  ipcopmake pwlib
+#  ipcopmake openh323
   ipcopmake wget
   ipcopmake wput
   ipcopmake bridge-utils
   ipcopmake screen
   ipcopmake hddtemp
+  ipcopmake smartmontools
   ipcopmake htop
   ipcopmake lynx
   echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE
@@ -722,6 +725,9 @@ buildipcop() {
 #  ipcopmake amavisd
   echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
+  ipcopmake zaptel
+  ipcopmake libpri
+  ipcopmake bristuff
   ipcopmake asterisk
   ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
@@ -738,6 +744,7 @@ buildipcop() {
   ipcopmake portmap
   ipcopmake nfs
   ipcopmake nmap
+  ipcopmake mbmon
   ipcopmake iftop
   ipcopmake ncftp
   ipcopmake cftp
@@ -856,7 +863,7 @@ ipfirepackages() {
   fi
   ipfiredist amavisd
   ipfiredist applejuice
-  ipfiredist asterisk
+  # ipfiredist asterisk
   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrusimap
@@ -913,9 +920,9 @@ build)
 
 	# Setzen des IPFire Builds
 	if [ "$FIREBUILD" ]; then
-		echo "$FIREBUILD" > $CONFIG_ROOT/firebuild
+		echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild
 	else
-		echo "_(OvO)_" > $CONFIG_ROOT/firebuild
+		echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
 	fi
 
 	buildinstaller
@@ -1110,15 +1117,12 @@ gettoolchain)
 	wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
 	if [ $? -ne 0 ]; then
 		echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
-#	else
-#		if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
-#			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
-#			echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
-#			cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
-#			rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
-#		else
-#			exiterror "$PACKAGE.md5 did not match, check downloaded package"
-#		fi
+	else
+		if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
+			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
+		else
+			exiterror "$PACKAGE.md5 did not match, check downloaded package"
+		fi
 	fi
 	;;
 paks)
@@ -1134,7 +1138,8 @@ commit)
 	echo "Upload the changed files:"
 	svn commit
 	./make.sh sync
-	svn up > /dev/null
+	clear
+	svn up
 	;;
 make)
 	echo "Do a complete compile:"	
@@ -1211,6 +1216,12 @@ pub-paks)
 		echo -e "There was an error while uploading the packages to the ftp server."
 	fi
 	;;
+build-only)
+	rm -f $BASEDIR/log/$2*
+	BUILDMACHINE=`uname -m`
+	prepareenv
+	ipcopmake $2
+	;;
 *)
 	echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub-iso|pub-paks|shell|sync|toolchain|update}"
 	cat doc/make.sh-usage