]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
Geaendert:
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 8a09d7e9212353b9d3f7fbbed81dca08e287f441..66e821ff284b8eb851c776efd6dc98b5ad18d98c 100644 (file)
--- 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
   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`
@@ -55,6 +61,7 @@
   mkdir $BASEDIR/log/ 2>/dev/null
 
   if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then
+
        echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE
        MACHINE=i386
        BUILDTARGET=i386-pc-linux-gnu
@@ -335,9 +342,8 @@ 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/*.tar.gz | grep $1` ]; then
                echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-               cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
                chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
@@ -353,9 +359,9 @@ ipfiredist() {
                if [ $? -ne 0 ]; then
                        exiterror "Packaging $1"
                fi
-          else
-               echo "`date -u '+%b %e %T'`: Packaging: The package $1 already exists"
-          fi
+#         else
+#              echo "`date -u '+%b %e %T'`: Packaging: The package $1 already exists"
+#         fi
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
        fi
@@ -545,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
@@ -565,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
@@ -638,6 +646,7 @@ buildipcop() {
   ipcopmake Convert-UUlib
   ipcopmake Archive-Tar
   ipcopmake Archive-Zip
+  ipcopmake Text-Tabs+Wrap
   ipcopmake Locale-Country
   ipcopmake GeoIP
   ipcopmake fwhits
@@ -656,7 +665,6 @@ buildipcop() {
   #ipcopmake speedycgi
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
-  ipcopmake saslauthd PASS=2
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake squidguard
@@ -666,13 +674,17 @@ buildipcop() {
   #ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
-  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
+#  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
   ipcopmake pakfire
   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
   ipcopmake lzo
@@ -682,6 +694,7 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=2
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
@@ -689,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
@@ -703,29 +717,35 @@ buildipcop() {
   ipcopmake procmail
   ipcopmake fetchmail
   ipcopmake cyrusimap
+  ipcopmake web-cyradm
   ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
   ipcopmake spamassassin
-  ipcopmake amavisd
+#  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
   ipcopmake lame
   ipcopmake gnump3d
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake edonkeyclc
-  ipcopmake sane
+#  ipcopmake sane
   echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
   ipcopmake ntop
-  ipcopmake rsync
+#  ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
+  ipcopmake nfs
   ipcopmake nmap
+  ipcopmake mbmon
   ipcopmake iftop
-  ipcopmake nfs
   ipcopmake ncftp
   ipcopmake cftp
   ipcopmake etherwake
@@ -836,8 +856,16 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  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
   ipfiredist fetchmail
   ipfiredist gnump3d
@@ -845,20 +873,20 @@ ipfirepackages() {
   ipfiredist lame
   ipfiredist libtiff
   ipfiredist libxml2
-  ipfiredist mc
+  ipfiredist mailx
+  ipfiredist nfs
+  ipfiredist nmap
   ipfiredist ntop
   ipfiredist postfix
-  ipfiredist pwlib
+  ipfiredist procmail
   ipfiredist samba
-  ipfiredist sane
-  ipfiredist spandsp
-  ipfiredist sudo
+  ipfiredist spamassassin
+  ipfiredist web-cyradm
   ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
-  rm -rf $LFS/paks
-  rm -rf $BASEDIR/build/tmp/*
+  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf  $BASEDIR/build/install/packages/*
 }
 
 # See what we're supposed to do
@@ -886,8 +914,17 @@ build)
                echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE
                prepareenv
        fi
+
        buildbase
        buildipcop
+
+       # Setzen des IPFire Builds
+       if [ "$FIREBUILD" ]; then
+               echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild
+       else
+               echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
+       fi
+
        buildinstaller
        buildpackages
        ;;
@@ -973,7 +1010,6 @@ newpak)
                cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
 
                touch ROOTFILES
-               touch CONFFILES
                touch {,un}install.sh
        ## install.sh
                echo '#!/bin/bash' > install.sh
@@ -1081,21 +1117,18 @@ 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)
        prepareenv
-       buildpackages
-       ipfirepackages
+       buildpackages
+       ipfirepackages
        ;;
 update)
        echo "Load the latest source-files:"
@@ -1105,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:"   
@@ -1119,7 +1153,11 @@ diff)
        ;;
 sync)
        echo -e "Syncing Cache to FTP:"
-       echo -ne "Password for mirror.ipfire.org: "; read PASS
+       if [ -f .pass ]; then
+               PASS="`cat .pass`"
+       else
+               echo -ne "Password for mirror.ipfire.org: "; read PASS
+       fi
        rm -f doc/packages-to-remove-from-ftp
        ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/source/ > ftplist
        for i in `ls -w1 cache/`; do
@@ -1143,7 +1181,11 @@ sync)
        ;;
 pub-iso)
        echo -e "Upload the ISO to the beta-mirror!"
-       echo -ne "Password for mirror.ipfire.org: "; read PASS
+       if [ -f .pass ]; then
+               PASS="`cat .pass`"
+       else
+               echo -ne "Password for mirror.ipfire.org: "; read PASS
+       fi
        ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/beta/ | grep `svn info | grep Revision | cut -c 11-`
        if [ "$?" -eq "1" ]; then
                        cp $BASEDIR/ipfire-install-1.4.i386.iso $BASEDIR/ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
@@ -1162,7 +1204,11 @@ pub-iso)
        ;;
 pub-paks)
        echo -e "Upload the packages to the beta-mirror!"
-       echo -ne "Password for mirror.ipfire.org: "; read PASS
+       if [ -f .pass ]; then
+               PASS="`cat .pass`"
+       else
+               echo -ne "Password for mirror.ipfire.org: "; read PASS
+       fi
        ncftpput -z -u web3 -p $PASS mirror.ipfire.org /html/source-packages/packages/ packages/*
        if [ "$?" -eq "0" ]; then
                echo -e "The packages were successfully uploaded to the ftp server."
@@ -1170,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