X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=a7cccf0236b903b0a4f94211ab3fd189cd81ccb9;hp=61c5d76e0179c61466ea6ea6ec0a82fb07b8a74e;hb=249fa1ff3f2dcad5ef28f3b6e9cff7f32377a013;hpb=a414d696317102aa6cb42f0704a6877642e8094a diff --git a/make.sh b/make.sh index 61c5d76e01..a7cccf0236 100644 --- a/make.sh +++ b/make.sh @@ -26,11 +26,10 @@ 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` @@ -505,8 +504,8 @@ buildbase() { } buildipcop() { - # Run IPCop make scripts one by one - LOGFILE="$BASEDIR/log/_build.ipcop.log" + # Run IPFire make scripts one by one + LOGFILE="$BASEDIR/log/_build.ipfire.log" export LOGFILE echo -ne "`date -u '+%b %e %T'`: Stage3 $NAME build \n" | tee -a $LOGFILE @@ -540,6 +539,7 @@ buildipcop() { ipcopmake fcdslsl SMP=1 ipcopmake fcdslusb SMP=1 ipcopmake fcdslslusb SMP=1 + ipcopmake fcpci SMP=1 ipcopmake pulsar SMP=1 ipcopmake unicorn SMP=1 fi @@ -559,7 +559,8 @@ buildipcop() { ipcopmake fcdsl2 ipcopmake fcdslsl ipcopmake fcdslusb - ipcopmake fcdslslusb + ipcopmake fcdslslusb + ipcopmake fcpci ipcopmake pulsar ipcopmake unicorn fi @@ -623,6 +624,17 @@ 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 GeoIP + ipcopmake fwhits ipcopmake noip_updater ipcopmake ntp ipcopmake oinkmaster @@ -639,12 +651,14 @@ buildipcop() { ipcopmake tcpdump ipcopmake traceroute ipcopmake vlan - ipcopmake wireless + #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 ## Zuerst die Libs und dann die Programme. Ordnung muss sein! ipcopmake berkeley + ipcopmake BerkeleyDB ## The Perl module ipcopmake libtiff ipcopmake libjpeg ipcopmake libxml2 @@ -661,6 +675,7 @@ buildipcop() { ipcopmake xinetd ipcopmake ghostscript ipcopmake cups +# ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist. ipcopmake samba ipcopmake sudo ipcopmake mc @@ -668,24 +683,37 @@ buildipcop() { ipcopmake openh323 ipcopmake wget ipcopmake bridge-utils + echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE ipcopmake postfix ipcopmake fetchmail ipcopmake cyrusimap + ipcopmake procmail + ipcopmake mailx + 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 edonkeyclc - ipcopmake sane + echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE ipcopmake lame ipcopmake gnump3d - ipcopmake clamav -# ipcopmake spamassassin + ipcopmake java + ipcopmake openvpn + ipcopmake edonkeyclc + ipcopmake sane ipcopmake rsync ipcopmake tcpwrapper + ipcopmake portmap + ipcopmake nmap + ipcopmake htop + ipcopmake nfs + ipcopmake ncftp + ipcopmake ethereal # 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 +# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen } buildinstaller() { @@ -850,7 +878,7 @@ shell) ;; changelog) echo -n "Loading new Changelog from SVN: " - svn log > doc/ChangeLog + svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog echo "Finished!" ;; check) @@ -899,18 +927,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 "Updating & building source package from SVN: " + 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 @@ -1036,6 +1065,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 @@ -1047,12 +1077,45 @@ update) ;; commit) echo "Upload the changed files:" - ./make.sh changelog svn commit - svn up + 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" + ;; +sync) + echo -e "Syncing Cache to FTP:" + echo -ne "Password for mirror.ipfire.org: "; read PASS + 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 + grep $i ftplist + if [ "$?" -ne "0" ]; then + ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/source cache/$i + if [ "$?" -eq "0" ]; then + echo -e "$i was successfully uploaded to the ftp server." + else + echo -e "There was an error while uploading $i to the ftp server." + fi + fi + done + for i in `cat ftplist`; do + ls -w1 cache/ | grep $i + if [ "$?" -eq "1" ]; then + echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp + fi + done + rm -f ftplist ;; *) - echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|dist|gettoolchain|newpak|prefetch|shell|toolchain|update}" + echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}" cat doc/make.sh-usage exit 1 ;;