X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=e2cf36b9b9cfe21a084798a86b642d1137ed278e;hp=ef4dfc0fd838cb91033c8a61a6261124f9e2cb1d;hb=5e773594ffedd503f864975b9a4aacb4bc6093bc;hpb=7ccede9b397ea877868bc837d93d8c3ce5b370b9

diff --git a/make.sh b/make.sh
index ef4dfc0fd8..e2cf36b9b9 100644
--- a/make.sh
+++ b/make.sh
@@ -344,7 +344,7 @@ ipcopmake() {
 
 ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-#	   if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
+#	   if [ ! `ls -w1 $BASEDIR/packages/*.ipfire | grep $1` ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
 		chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
@@ -587,6 +587,11 @@ buildipcop() {
   ipcopmake python
   ipcopmake libnet
   ipcopmake libpng
+  ipcopmake libtiff
+  ipcopmake libjpeg
+  ipcopmake lcms
+  ipcopmake libmng
+  ipcopmake freetype
   ipcopmake gd
   ipcopmake popt
   ipcopmake slang
@@ -681,11 +686,6 @@ buildipcop() {
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake java
-  ipcopmake libtiff
-  ipcopmake libjpeg
-  ipcopmake lcms
-  ipcopmake libmng
-  ipcopmake freetype
   ipcopmake bootsplash
   ipcopmake libxml2
   ipcopmake spandsp
@@ -732,12 +732,17 @@ buildipcop() {
   ipcopmake bristuff
   ipcopmake asterisk
   ipcopmake mpg123
-  echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
+  echo -ne "`date -u '+%b %e %T'`: Building ### Multimedia-Server ### \n" | tee -a $LOGFILE
+  ipcopmake libmad
   ipcopmake libogg
   ipcopmake libvorbis
   ipcopmake lame
+  ipcopmake xvid
+  ipcopmake mpeg2dec
+  ipcopmake ffmpeg
   ipcopmake sox
   ipcopmake gnump3d
+  ipcopmake videolan
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake ocaml
@@ -760,6 +765,7 @@ buildipcop() {
   ipcopmake tftp-hpa
   ipcopmake subversion
   ipcopmake iptraf
+  ipcopmake nagios
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
@@ -860,8 +866,8 @@ buildpackages() {
 		cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
 	fi
   done
-  cd $BASEDIR/packages; ls -w1 *.tar.gz | awk -F ".tar.gz" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
-  echo "###EOF###" >> $BASEDIR/packages/packages_list.txt
+  cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
+  echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
 
@@ -880,16 +886,20 @@ ipfirepackages() {
   ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist fetchmail
+  ipfiredist ffmpeg
   ipfiredist gnump3d
   ipfiredist iptraf
   ipfiredist java
   ipfiredist lame
+  ipfiredist libmad
   ipfiredist libogg
   ipfiredist libtiff
   ipfiredist libvorbis
   ipfiredist libxml2
   ipfiredist mailx
   ipfiredist mldonkey
+  ipfiredist mpeg2dec
+  ipfiredist nagios
   ipfiredist nfs
   ipfiredist nmap
   ipfiredist ntop
@@ -900,11 +910,13 @@ ipfirepackages() {
   ipfiredist sox
   ipfiredist spamassassin
   ipfiredist subversion
+  ipfiredist videolan
   ipfiredist web-cyradm
   ipfiredist xampp
 #  ipfiredist xinetd
+  ipfiredist xvid
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
 }
 
@@ -1179,6 +1191,7 @@ svn)
 			exit 1
 		fi
 		chmod 755 $0
+		tail log/_build.svn.update.log
 		exit 0
 	  ;;
 	  commit|ci)
@@ -1636,6 +1649,7 @@ batch)
 		if [ "$input" == "yes" ]; then
 			$0 svn commit
 		fi
+		$0 sync
 		;;
 	"SVN: Update")
 		$0 svn update