X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=c8c4adeafdf103d863e33cd571af0a993f90ca85;hp=5fe00355c7d83d5ef4b0f3d9d6bb4de3ffd580dd;hb=52345790a3bef3e0bb2a404153a7c0d1c8767e13;hpb=5cfe86e6c45e7fc9f75c301605daf17198fce12d

diff --git a/make.sh b/make.sh
index 5fe00355c7..c8c4adeafd 100644
--- a/make.sh
+++ b/make.sh
@@ -33,6 +33,12 @@
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
+  # Setzen des IPFire Builds
+  if [ -e ./.svn ]; then
+    FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
+#    VERSION="$VERSION (Build:$FIREBUILD)"
+  fi
+
   # Debian specific settings
   if [ ! -e /etc/debian_version ]; then
 	FULLPATH=`which $0`
@@ -673,6 +679,10 @@ buildipcop() {
   ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
+  ipcopmake lcms
+  ipcopmake libmng
+  ipcopmake freetype
+  ipcopmake bootsplash
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
@@ -690,8 +700,8 @@ buildipcop() {
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
-  ipcopmake pwlib
-  ipcopmake openh323
+#  ipcopmake pwlib
+#  ipcopmake openh323
   ipcopmake wget
   ipcopmake wput
   ipcopmake bridge-utils
@@ -712,6 +722,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
@@ -728,6 +741,7 @@ buildipcop() {
   ipcopmake portmap
   ipcopmake nfs
   ipcopmake nmap
+  ipcopmake mbmon
   ipcopmake iftop
   ipcopmake ncftp
   ipcopmake cftp
@@ -839,12 +853,14 @@ buildpackages() {
 }
 
 ipfirepackages() {
-  for i in `ls $BASEDIR/packages`; do
-	touch $BASEDIR/build/install/packages/$i.empty
-  done
+  if [ -d "$BASEDIR/packages" ]; then
+	  for i in `ls $BASEDIR/packages`; do
+		touch $BASEDIR/build/install/packages/$i.empty
+	  done
+  fi
   ipfiredist amavisd
   ipfiredist applejuice
-  ipfiredist asterisk
+  # ipfiredist asterisk
   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrusimap
@@ -900,10 +916,10 @@ build)
 	buildipcop
 
 	# Setzen des IPFire Builds
-	if [ -e ./.svn ]; then
-		cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p' > $LFS/home/httpd/html/firebuild
+	if [ "$FIREBUILD" ]; then
+		echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild
 	else
-		echo "_(OvO)_" > $LFS/home/httpd/html/firebuild
+		echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
 	fi
 
 	buildinstaller
@@ -1098,15 +1114,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)
@@ -1122,7 +1135,7 @@ commit)
 	echo "Upload the changed files:"
 	svn commit
 	./make.sh sync
-	svn up > /dev/null
+	svn up
 	;;
 make)
 	echo "Do a complete compile:"	
@@ -1199,6 +1212,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