Hinzugefuegt:

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

diff --git a/make.sh b/make.sh
index b67011261780569f39e53285c50ea65ff4edaaf9..143c0611e3cd1873a7ff6ba79a2bba1495d3e9b4 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -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
+  ipcopamke 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,6 +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 $PWD
 
@@ -878,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
@@ -898,9 +910,11 @@ 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
   rm -rf  $BASEDIR/build/install/packages/*
@@ -1194,7 +1208,7 @@ svn)
                $0 svn up
          ;;
          dist)
-               $0 svn up
+               #$0 svn up
                echo -ne "Download source package from svn..."
                svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
                if [ "$?" -eq "0" ]; then
@@ -1558,7 +1572,8 @@ unattended)
        fi
 
        echo "### MAKING SOURCES-ISO"
-       $0 sources-iso
+       echo "DISABLED by Delaco!"
+       #$0 sources-iso
 
        echo "### UPLOADING ISO"
        $0 upload iso
@@ -1633,6 +1648,7 @@ batch)
                if [ "$input" == "yes" ]; then
                        $0 svn commit
                fi
+               $0 sync
                ;;
        "SVN: Update")
                $0 svn update