]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
Hauptsächlich Quellenupdate. Apache - Bind - hddtemp - hdparm - lame
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index d825ef6cc51ea900a7119fef6a8ab08fc9b6e3ff..b51d3b6ce2c3ad1ece5fbf027c1fd521df13ca62 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -2,40 +2,35 @@
 #
 ############################################################################
 #                                                                          #
-# This file is part of the IPCop Firewall.                                 #
+# This file is part of the IPFire Firewall.                                #
 #                                                                          #
-# IPCop is free software; you can redistribute it and/or modify            #
+# IPFire is free software; you can redistribute it and/or modify           #
 # it under the terms of the GNU General Public License as published by     #
 # the Free Software Foundation; either version 2 of the License, or        #
 # (at your option) any later version.                                      #
 #                                                                          #
-# IPCop is distributed in the hope that it will be useful,                 #
+# IPFire is distributed in the hope that it will be useful,                #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of           #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
 # GNU General Public License for more details.                             #
 #                                                                          #
 # You should have received a copy of the GNU General Public License        #
-# along with IPCop; if not, write to the Free Software                     #
+# along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2001 Mark Wormgoor <mark@wormgoor.com>.                    #
-#                                                                          #
-# (c) 2001 Eric S. Johansson <esj@harvee.billerica.ma.us> Check for Bash   #
-# (c) 2002 Thorsten Fischer <frosch@cs.tu-berlin.de> MD5Sum checking       #
+# Copyright (C) 2006 IPFire-Team <entwickler@ipfire.org>.                  #
 #                                                                          #
 ############################################################################
-#
-# $Id: make.sh,v 1.129.2.145 2006/02/01 07:04:09 gespinasse Exp $
 #
 
-  NAME="IPFire"                                        # Software name
-  SNAME="ipfire"                                       # Short name
-  VERSION="1.4"                                # Version number
-  PREVIOUSTAG=IPCOP_v1_4_10_FINAL
-  SLOGAN="We save your network"                # Software slogan
-  CONFIG_ROOT=/var/ipfire                      # Configuration rootdir
+  NAME="IPFire"                        # Software name
+  SNAME="ipfire"                       # Short name
+  VERSION="1.4"                        # Version number
+# PREVIOUSTAG=IPCOP_v1_4_10_FINAL
+  SLOGAN="We secure your network"      # Software slogan
+  CONFIG_ROOT=/var/ipfire              # Configuration rootdir
   NICE=10
-  MAX_RETRIES=3                                        # prefetch/check loop
+  MAX_RETRIES=3                                # prefetch/check loop
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
 # Define immediately
 stdumount() {
        umount $BASEDIR/build/dev/pts           2>/dev/null;
-       umount $BASEDIR/build/proc              2>/dev/null;
-       umount $BASEDIR/build/install/mnt       2>/dev/null;
+       umount $BASEDIR/build/proc                      2>/dev/null;
+       umount $BASEDIR/build/install/mnt               2>/dev/null;
        umount $BASEDIR/build/usr/src/cache     2>/dev/null;
        umount $BASEDIR/build/usr/src/ccache    2>/dev/null;
        umount $BASEDIR/build/usr/src/config    2>/dev/null;
-       umount $BASEDIR/build/usr/src/doc       2>/dev/null;
-       umount $BASEDIR/build/usr/src/html      2>/dev/null;
+       umount $BASEDIR/build/usr/src/doc               2>/dev/null;
+       umount $BASEDIR/build/usr/src/html              2>/dev/null;
        umount $BASEDIR/build/usr/src/langs     2>/dev/null;
-       umount $BASEDIR/build/usr/src/lfs       2>/dev/null;
-       umount $BASEDIR/build/usr/src/log       2>/dev/null;
-       umount $BASEDIR/build/usr/src/src       2>/dev/null;
+       umount $BASEDIR/build/usr/src/lfs               2>/dev/null;
+       umount $BASEDIR/build/usr/src/log               2>/dev/null;
+       umount $BASEDIR/build/usr/src/src               2>/dev/null;
 }
 
 exiterror() {
@@ -339,6 +334,33 @@ ipcopmake() {
        return 0
 }
 
+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/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 \
+                                               VERSION=$VERSION \
+                                               CONFIG_ROOT=$CONFIG_ROOT \
+                                               NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
+                                               CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
+                                               CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \
+                                               KVER=$KVER \
+                                               BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+                   /bin/bash -x -c "cd /usr/src/lfs && \
+                   make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1
+               if [ $? -ne 0 ]; then
+                       exiterror "Packaging $1"
+               fi
+       else
+               exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
+       fi
+#      test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+#      mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
+       return 0
+}
+
 
 installmake() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
@@ -621,15 +643,45 @@ buildipcop() {
   ipcopmake libsafe
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
-  ipcopmake berkeley-DB
-  ipcopmake stund
-  ipcopmake lpd
+## Zuerst die Libs und dann die Programme. Ordnung muss sein!
+  ipcopmake berkeley
+  ipcopmake libtiff
+  ipcopmake libjpeg
+  ipcopmake libxml2
+  ipcopmake spandsp
+  ipcopmake lzo
+  ipcopmake pkg-config
+  ipcopmake glib
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  ipcopmake saslauthd PASS=2
+  ipcopmake xinetd
+  ipcopmake ghostscript
+  ipcopmake cups
+  ipcopmake samba
+  ipcopmake sudo
+  ipcopmake mc
   ipcopmake pwlib
   ipcopmake openh323
-  ipcopmake saslauthd
+  ipcopmake wget
+  ipcopmake bridge-utils
+  ipcopmake postfix
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
+  ipcopmake stund
+#  ipcopmake lpd
+  ipcopmake openvpn
+  ipcopmake asterisk
+  ipcopmake edonkeyclc
+  ipcopmake sane
+  ipcopmake lame
+  ipcopmake gnump3d
+#  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
 }
 
 buildinstaller() {
@@ -669,7 +721,7 @@ buildpackages() {
   echo "`date -u '+%b %e %T'`: Stripping files" | tee -a $LOGFILE
   find $LFS/lib $LFS/usr/lib $LFS/usr/share/rrdtool-* $LFS/install ! -type l \( -name '*.so' -o -name '*.so[\.0-9]*' \) \
        ! -name 'libc.so' ! -name 'libpthread.so' ! -name 'libcrypto.so.0.9.7.sha1' \
-       -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
+       -ls -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
   # add -ls before -exec if you want to verify what files are stripped
 
   find $LFS/{,s}bin $LFS/usr/{,s}bin $LFS/usr/local/{,s}bin ! -type l \
@@ -693,7 +745,7 @@ buildpackages() {
        cd $BASEDIR
   fi
 
-  # Create update for this version
+ Create update for this version
 #  echo "`date -u '+%b %e %T'`: Building update $VERSION tgz" | tee -a $LOGFILE
 #  tar -cz -C $BASEDIR/build --files-from=$BASEDIR/updates/$VERSION/ROOTFILES.$MACHINE-$VERSION -f $BASEDIR/updates/$VERSION/patch.tar.gz --exclude='#*'; 
 #  chmod 755 $BASEDIR/updates/$VERSION/setup
@@ -705,19 +757,36 @@ buildpackages() {
   rm -f $BASEDIR/doc/packages-list
   for i in `ls -1tr $BASEDIR/log/[^_]*`; do
        if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
-               echo "* `basename $i`" >>$BASEDIR/doc/packages-list
+               echo "  * `basename $i`" >>$BASEDIR/doc/packages-list
        fi
   done
-  echo "!!! List of softwares used to build $NAME Version:$VERSION" > $BASEDIR/doc/packages-list.txt
+  echo "====== List of softwares used to build $NAME Version: $VERSION ======" > $BASEDIR/doc/packages-list.txt
   grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|stage2$\|smp$\|tools$\|tools1$\|tools2$' \
        $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
   rm -f $BASEDIR/doc/packages-list
-  # packages-list.txt is ready to be displayed for wiki page IPCopSoftwares
+  # packages-list.txt is ready to be displayed for wiki page
 
   # Create ISO for CDRom and USB-superfloppy
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
+  # Build IPFire packages
+  ipfiredist asterisk
+  ipfiredist cyrusimap
+  ipfiredist fetchmail
+  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/*
@@ -885,30 +954,56 @@ dist)
                fi
        fi
        ;;
-newupdate)
-       # create structure for $VERSION update
-       if [ ! -f "updates/$VERSION" ]; then
-               mkdir -p updates/$VERSION
-               cd updates/$VERSION
-               touch information
-               echo 'etc/issue' > ROOTFILES.alpha-$VERSION
-               echo 'etc/issue' > ROOTFILES.i386-$VERSION
-               echo 'patch.tar.gz' > .cvsignore
-               sed -e "s+^UPGRADEVERSION.*$+UPGRADEVERSION=$VERSION+" $BASEDIR/src/scripts/updatesetup > setup
-               chmod 755 setup
-               cd ..
-               echo "Adding directory $VERSION to cvs"
-               cvs add $VERSION
-               echo "Adding files to cvs"
-               cvs add $VERSION/ROOTFILES.alpha-$VERSION \
-                       $VERSION/ROOTFILES.i386-$VERSION \
-                       $VERSION/information \
-                       $VERSION/setup \
-                       $VERSION/.cvsignore
+newpak)
+       # create structure for a new package
+       echo -e "Name of the new package: $2"
+       if [ ! -f "lfs/$2" ]; then
+               echo "`date -u '+%b %e %T'`: Creating directory src/paks/$2"
+               mkdir -p src/paks/$2
+               cd src/paks/$2
+               echo "`date -u '+%b %e %T'`: Creating files"
+               cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
+
+               touch ROOTFILES
+               touch CONFFILES
+               touch {,un}install.sh
+       ## install.sh
+               echo '#!/bin/bash' > install.sh
+               echo '#' >> install.sh
+               echo '#################################################################' >> install.sh
+               echo '#                                                               #' >> install.sh
+               echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> install.sh
+               echo '#                                                               #' >> install.sh
+               echo '#################################################################' >> install.sh
+               echo '#' >> install.sh
+               echo '# Extract the files' >> install.sh
+               echo 'tar xfz files.tgz -C /' >> install.sh
+               echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2' >> install.sh
+       ## uninstall.sh
+               echo '#!/bin/bash' > uninstall.sh
+               echo '#################################################################' >> uninstall.sh
+               echo '#                                                               #' >> uninstall.sh
+               echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> uninstall.sh
+               echo '#                                                               #' >> uninstall.sh
+               echo '#################################################################' >> uninstall.sh
+               echo '#' >> uninstall.sh
+               echo '# Delete the files' >> uninstall.sh
+               echo '## Befehl fehlt noch' >> uninstall.sh
+               echo 'rm -f /opt/pakfire/installed/ROOTFILES.$2' >> uninstall.sh
+               echo "`date -u '+%b %e %T'`: Adding files to SVN"
+               cd - && svn add lfs/$2 && svn add src/paks/$2
+
+               echo -n "Do you want to remove the folders? [y/n]"
+               read REM
+               if  [ "$REM" == "y" ]; then
+                       echo "Removing the folders..."
+                       svn del src/paks/$2 --force
+               else
+                       echo "Folders are kept."
+               fi
        else
-               echo "update/$VERSION already exist"
+               echo "$2 already exists"
        fi
-       cd -
        exit 0
        ;;
 prefetch)
@@ -1005,23 +1100,29 @@ toolchain)
 gettoolchain)
        BUILDMACHINE=`uname -m`
        # arbitrary name to be updated in case of new toolchain package upload
-       PACKAGE=$SNAME-1.4.11-toolchain-$BUILDMACHINE
-       URL_SFNET=`grep URL_SFNET lfs/Config | awk '{ print $3 }'`
+       PACKAGE=$SNAME-1.4-toolchain-$BUILDMACHINE
+       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_SFNET/ipcop/$PACKAGE.tar.gz $URL_SFNET/ipcop/$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
                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 xvfz cache/$PACKAGE.tar.gz -C .
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi
        fi
        ;;
+update)
+       echo "Load the latest source-files:"
+       svn update
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newupdate|prefetch|rootfiles|shell|toolchain}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newpak|prefetch|rootfiles|shell|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;