X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=b51d3b6ce2c3ad1ece5fbf027c1fd521df13ca62;hp=928220e41816d155e0d514f1d76b7d006ed92505;hb=316160b0f25bd314c019478a83f0215ef0955ebf;hpb=1fe6c87bf3995d09f1e2c4be7135860127805c21 diff --git a/make.sh b/make.sh index 928220e418..b51d3b6ce2 100644 --- a/make.sh +++ b/make.sh @@ -2,35 +2,30 @@ # ############################################################################ # # -# 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 . # -# # -# (c) 2001 Eric S. Johansson Check for Bash # -# (c) 2002 Thorsten Fischer MD5Sum checking # +# Copyright (C) 2006 IPFire-Team . # # # ############################################################################ -# -# $Id: make.sh,v 1.129.2.145 2006/02/01 07:04:09 gespinasse Exp $ # - NAME="IPFire" # Software name + NAME="IPFire" # Software name SNAME="ipfire" # Short name - VERSION="1.4" # Version number + VERSION="1.4" # Version number # PREVIOUSTAG=IPCOP_v1_4_10_FINAL SLOGAN="We secure your network" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -342,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 \ @@ -361,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 } @@ -652,21 +643,45 @@ buildipcop() { ipcopmake libsafe ipcopmake 3c5x9setup echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE - ipcopmake wget - ipcopmake berkeley-DB +## 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 bridge-utils ipcopmake pam ipcopmake pammysql - ipcopmake saslauthd - ipcopmake postfix - ipcopmake stund - ipcopmake lpd + 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 - wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db - ipcopmake hddtemp - + 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() { @@ -749,14 +764,28 @@ buildpackages() { 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 @@ -925,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) @@ -1045,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 ;;