]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
HinzugefĆ¼gt:
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 31c5a4cc72635fe2c51ea1411d654bbf12bd1a79..6908a2175f638920dd3cfa0fa90a09696fd8f2fe 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -337,7 +337,7 @@ ipcopmake() {
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
                echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-               cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/sbin/
+               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 \
@@ -356,12 +356,8 @@ ipfiredist() {
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
        fi
-       if [ -e $BASEDIR/packages ]; then
-               mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
-       else
-               mkdir -p $BASEDIR/packages
-               mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
-       fi
+#      test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+#      mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
        return 0
 }
 
@@ -627,6 +623,15 @@ buildipcop() {
   ipcopmake Net-DNS
   ipcopmake Net-IPv4Addr
   ipcopmake Net_SSLeay
+  ipcopmake IO-Stringy
+  ipcopmake Unix-Syslog
+  ipcopmake Mail-Tools
+  ipcopmake MIME-Tools
+  ipcopmake Net-Server
+  ipcopmake Convert-TNEF
+  ipcopmake Convert-UUlib
+  ipcopmake Archive-Tar
+  ipcopmake Archive-Zip
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -648,8 +653,10 @@ buildipcop() {
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
-  ipcopmake berkeley-DB
+  ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module
   ipcopmake libtiff
+  ipcopmake libjpeg
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
@@ -658,23 +665,42 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  ipcopmake saslauthd PASS=2
+  ipcopmake xinetd
+  ipcopmake ghostscript
+  ipcopmake cups
+#  ipcopmake lpd
+  ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
   ipcopmake pwlib
   ipcopmake openh323
-  ipcopmake xinetd
   ipcopmake wget
   ipcopmake bridge-utils
-  ipcopmake saslauthd PASS=1
-  ipcopmake openldap
-  ipcopmake saslauthd PASS=2
-  ipcopmake samba
+  echo -ne "`date -u '+%b %e %T'`: Building Mailserver \n" | tee -a $LOGFILE
   ipcopmake postfix
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
+  ipcopmake procmail
+  ipcopmake clamav
+  ipcopmake razor
+  ipcopmake spamassassin
+  ipcopmake amavisd
+  echo -ne "`date -u '+%b %e %T'`: Building VoIP-Server \n" | tee -a $LOGFILE
   ipcopmake stund
-  ipcopmake lpd
-  ipcopmake openvpn
   ipcopmake asterisk
+  ipcopmake openvpn
   ipcopmake edonkeyclc
+  ipcopmake sane
+  echo -ne "`date -u '+%b %e %T'`: Building MP3-Server \n" | tee -a $LOGFILE
+  ipcopmake lame
+  ipcopmake gnump3d
+  ipcopmake rsync
+  ipcopmake tcpwrapper
+  ipcopmake portmap
+  ipcopmake nfs
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
 # ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
@@ -767,13 +793,23 @@ buildpackages() {
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
   # Build IPFire packages
+  ipfiredist asterisk
+  ipfiredist cyrusimap
+  ipfiredist fetchmail
+  ipfiredist gnump3d
   ipfiredist libtiff
   ipfiredist libxml2
   ipfiredist mc
   ipfiredist postfix
+  ipfiredist pwlib
+  ipfiredist sane
   ipfiredist spandsp
   ipfiredist sudo
+  ipfiredist xampp
   ipfiredist xinetd
+  test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+  cp -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -831,20 +867,9 @@ shell)
        entershell
        ;;
 changelog)
-       echo "Building doc/Changelog from CVS"
-       # cv2cl script come from http://www.red-bean.com/cvs2cl/
-       if [ ! -s $BASEDIR/doc/CVS/Tag ]; then
-               BRANCHOPTS=""
-       else
-               BRANCH=`cat $BASEDIR/doc/CVS/Tag`
-               BRANCH=${BRANCH:1}
-               BRANCHOPTS="--follow-only $BRANCH"
-       fi
-       
-       $BASEDIR/tools/cvs2cl.pl --gmt --show-dead $BRANCHOPTS -f $BASEDIR/doc/ChangeLog
-       rm -f $BASEDIR/doc/ChangeLog.bak
-       echo
-       echo "Commit the change now to update CVS"
+       echo -n "Loading new Changelog from SVN: "
+       svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog
+       echo "Finished!"
        ;;
 check)
        echo "Checking sources files availability on the web"
@@ -892,54 +917,19 @@ clean)
        done
        rm -rf $BASEDIR/build
        rm -rf $BASEDIR/cdrom
+       rm -rf $BASEDIR/packages
        rm -rf $BASEDIR/log
-       rm -f $BASEDIR/updates/$VERSION/patch.tar.gz;
        if [ -h /tools ]; then
                rm -f /tools
        fi
        ;;
 dist)
-       echo "Building source package from CVS, list of changed files, MD5 of release files"
-       if [ ! -s $BASEDIR/doc/CVS/Tag ]; then
-               BRANCH=""
-               BRANCHOPTS="-D `date +'%Y-%m-%d'`"
-       else
-               BRANCH=`cat $BASEDIR/doc/CVS/Tag`
-               BRANCH=${BRANCH:1}
-               BRANCHOPTS="-r $BRANCH"
-       fi
-
-       rm -rf $BASEDIR/build/tmp/$SNAME-$VERSION $BASEDIR/doc/release.txt
-       cd $BASEDIR/build/tmp
-       # build sources tgz
-       echo "Export tree $BRANCH $SNAME-$VERSION"
-       cvs -z3 -d `cat $BASEDIR/CVS/Root` export $BRANCHOPTS ipcop
-       if [ $? -eq 0 ]; then
-               mv ipcop $SNAME-$VERSION
-               tar cfz $BASEDIR/$SNAME-sources-$VERSION.tgz $SNAME-$VERSION
-               cd $BASEDIR
-
-               if [ ! -d $BASEDIR/build/tmp/$PREVIOUSTAG ]; then
-                       # export previous version to be compared with actual, this help to check wich files need to go in update
-                       cd $BASEDIR/build/tmp
-                       echo "Export tree $PREVIOUSTAG"
-                       cvs -z3 -d `cat $BASEDIR/CVS/Root` export -r $PREVIOUSTAG ipcop
-                       mv ipcop $PREVIOUSTAG
-               fi
-               if [ -d $BASEDIR/build/tmp/$PREVIOUSTAG -o -d $BASEDIR/build/tmp/$SNAME-$VERSION ]; then
-                       cd $BASEDIR/build/tmp
-                       echo "diff $PREVIOUSTAG <> $BRANCH $SNAME-$VERSION >doc/updated-sources.txt"
-                       diff -rq $PREVIOUSTAG $SNAME-$VERSION > $BASEDIR/doc/updated-sources.txt
-                       mv $BASEDIR/doc/updated-sources.txt $BASEDIR/doc/updated-sources.bak
-                       sed -e "s+Files $PREVIOUSTAG\/++" \
-                               -e "s+ and .*$++" \
-                               -e "s+src/rc.d+etc/rc.d+" \
-                               -e "s+^langs/+var/ipcop/langs/+" \
-                               -e "s+html/cgi-bin+home/httpd/cgi-bin+" $BASEDIR/doc/updated-sources.bak \
-                               > $BASEDIR/doc/updated-sources.txt
-                       rm -f $BASEDIR/doc/updated-sources.bak
-               fi
-       fi
+       echo -ne "Updating & building source package from SVN: "
+       svn up > /dev/null
+       svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
+       tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
+       rm ipfire-source/ -r
+       echo "Finished!"
        ;;
 newpak)
        # create structure for a new package
@@ -1037,40 +1027,6 @@ prefetch)
        fi
        cd -
        ;;
-rootfiles)
-       PREVIOUSVERSION=`echo $PREVIOUSTAG | sed -e 's/IPCOP_v//' -e 's/_FINAL//' -e 's/_/\./g'`
-       # make md5 list of actual build
-       # some packages include a timestamp (kernel/perl/python/vim and more), so md5 vary at each build
-       # anyway, it is sometime usable after a patch or a minor upgrade to know wich files include in update
-       if [ ! -f "$BASEDIR/build/install/cdrom/$SNAME-$VERSION.tgz" ]; then
-               echo "need cdrom be build to read include files list, use ./make.sh build before."
-       else
-               tar tzf $BASEDIR/build/install/cdrom/$SNAME-$VERSION.tgz > $BASEDIR/updates/$VERSION/FILES.tmp
-               cd $BASEDIR/build
-               rm -f $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5
-               for line in `cat $BASEDIR/updates/$VERSION/FILES.tmp`; do
-                       if [ -f "$line" -a ! -L "$line" ]; then
-                               md5sum "$line" >> $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5
-                       fi
-               done
-               diff $BASEDIR/updates/$PREVIOUSVERSION/FILES-$MACHINE-$PREVIOUSVERSION.md5 \
-                       $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5 \
-                       > $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff
-               awk '$1==">" {print $3}' $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff \
-                       > $BASEDIR/updates/$VERSION/ROOTFILES.add.$MACHINE
-               awk '$1=="<" {print $3}' $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff \
-                       > $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE.tmp
-               rm -f $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE
-               for line in `cat $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE.tmp`; do
-                       # a file is only removed when not in add file
-                       if ( ! grep -q "^$line$" $BASEDIR/updates/$VERSION/ROOTFILES.add.$MACHINE ); then
-                               echo $line >> $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE
-                       fi
-               done
-               rm -f $BASEDIR/updates/$VERSION/{FILES.tmp,FILES-*.diff,ROOTFILES.remove.*.tmp}
-       fi
-       exit 0
-       ;;
 toolchain)
        prepareenv
        buildtoolchain
@@ -1091,7 +1047,7 @@ gettoolchain)
        URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
        echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
        cd $BASEDIR/cache
-       wget -c $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+       wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
        else
@@ -1099,6 +1055,7 @@ gettoolchain)
                        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 xvfz cache/$PACKAGE.tar.gz -C .
+                       rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi
@@ -1108,8 +1065,23 @@ update)
        echo "Load the latest source-files:"
        svn update
        ;;
+commit)
+       echo "Upload the changed files:"
+       svn commit
+       svn up > /dev/null
+       ;;
+make)
+       echo "Do a complete compile:"   
+       ./make.sh prefetch && ./make.sh build
+       ;;
+diff)
+       echo -ne "Make a local diff to last SVN revision: "
+       svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
+       echo "Finished!"
+       echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newpak|prefetch|rootfiles|shell|toolchain|update}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;