Toolchain-Download mit ./make.sh gettoolchain

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

diff --git a/make.sh b/make.sh
index a1f0bfabf821d1c65ea97af29374c39b37f47d1d..a543f1ecdfdf32fc62f74a8135f8ba4a2ff02361 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -29,11 +29,11 @@
 #
 
   NAME="IPFire"                                # Software name
-  SNAME="ipfire"                               # Short 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
+# 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
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
@@ -339,6 +339,37 @@ 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/sbin/
+               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
+       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
+       return 0
+}
+
 
 installmake() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
@@ -621,8 +652,10 @@ buildipcop() {
   ipcopmake libsafe
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
+  ipcopmake wget
   ipcopmake berkeley-DB
   ipcopmake xampp
+  ipcopmake bridge-utils
   ipcopmake pam
   ipcopmake pammysql
   ipcopmake saslauthd
@@ -631,6 +664,8 @@ buildipcop() {
   ipcopmake lpd
   ipcopmake pwlib
   ipcopmake openh323
+  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
+  ipcopmake hddtemp
 
 }
 
@@ -707,10 +742,10 @@ 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
@@ -719,6 +754,9 @@ buildpackages() {
   # Create ISO for CDRom and USB-superfloppy
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  
+  # Build IPFire packages
+  ipfiredist postfix
 
   # Cleanup
   stdumount
@@ -1007,16 +1045,18 @@ 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 -c $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
@@ -1027,4 +1067,4 @@ gettoolchain)
        cat doc/make.sh-usage
        exit 1
        ;;
-esac
\ No newline at end of file
+esac