X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=66e821ff284b8eb851c776efd6dc98b5ad18d98c;hp=5959202cae67705d479dd97679e0a7e32cbc2081;hb=649fd2958d715c838ef0fa28e93931327983cafd;hpb=371d9df0da9361e8f469a98b828e67ff3e980a96 diff --git a/make.sh b/make.sh index 5959202cae..66e821ff28 100644 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name - VERSION="1.4" # Version number + VERSION="2.0" # Version number SLOGAN="We secure your network" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 @@ -33,6 +33,12 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` + # Setzen des IPFire Builds + if [ -e ./.svn ]; then + FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'` +# VERSION="$VERSION (Build:$FIREBUILD)" + fi + # Debian specific settings if [ ! -e /etc/debian_version ]; then FULLPATH=`which $0` @@ -55,6 +61,7 @@ mkdir $BASEDIR/log/ 2>/dev/null if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then + echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE MACHINE=i386 BUILDTARGET=i386-pc-linux-gnu @@ -544,6 +551,7 @@ buildipcop() { ipcopmake fcclassic SMP=1 ipcopmake pulsar SMP=1 ipcopmake unicorn SMP=1 + ipcopmake promise-sata-300-tx SMP=1 fi ipcopmake linux LFS_PASS=ipfire @@ -564,8 +572,9 @@ buildipcop() { ipcopmake fcdslslusb ipcopmake fcpci ipcopmake fcclassic - ipcopmake pulsar - ipcopmake unicorn + ipcopmake pulsar + ipcopmake unicorn + ipcopmake promise-sata-300-tx fi ipcopmake pcmcia-cs @@ -637,6 +646,7 @@ buildipcop() { ipcopmake Convert-UUlib ipcopmake Archive-Tar ipcopmake Archive-Zip + ipcopmake Text-Tabs+Wrap ipcopmake Locale-Country ipcopmake GeoIP ipcopmake fwhits @@ -671,6 +681,10 @@ buildipcop() { ipcopmake java ipcopmake libtiff ipcopmake libjpeg + ipcopmake lcms + ipcopmake libmng + ipcopmake freetype + ipcopmake bootsplash ipcopmake libxml2 ipcopmake spandsp ipcopmake lzo @@ -688,13 +702,14 @@ buildipcop() { ipcopmake samba ipcopmake sudo ipcopmake mc - ipcopmake pwlib - ipcopmake openh323 +# ipcopmake pwlib +# ipcopmake openh323 ipcopmake wget ipcopmake wput ipcopmake bridge-utils ipcopmake screen ipcopmake hddtemp + ipcopmake smartmontools ipcopmake htop ipcopmake lynx echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE @@ -702,13 +717,17 @@ buildipcop() { ipcopmake procmail ipcopmake fetchmail ipcopmake cyrusimap + ipcopmake web-cyradm ipcopmake mailx ipcopmake clamav ipcopmake razor ipcopmake spamassassin - ipcopmake amavisd +# ipcopmake amavisd echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE ipcopmake stund + ipcopmake zaptel + ipcopmake libpri + ipcopmake bristuff ipcopmake asterisk ipcopmake mpg123 echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE @@ -725,6 +744,7 @@ buildipcop() { ipcopmake portmap ipcopmake nfs ipcopmake nmap + ipcopmake mbmon ipcopmake iftop ipcopmake ncftp ipcopmake cftp @@ -836,11 +856,14 @@ buildpackages() { } ipfirepackages() { - for i in `ls $BASEDIR/packages`; do - touch $BASEDIR/build/install/packages/$i.empty - done + if [ -d "$BASEDIR/packages" ]; then + for i in `ls $BASEDIR/packages`; do + touch $BASEDIR/build/install/packages/$i.empty + done + fi + ipfiredist amavisd ipfiredist applejuice - ipfiredist asterisk + # ipfiredist asterisk ipfiredist clamav ipfiredist cups ipfiredist cyrusimap @@ -850,10 +873,15 @@ ipfirepackages() { ipfiredist lame ipfiredist libtiff ipfiredist libxml2 + ipfiredist mailx + ipfiredist nfs + ipfiredist nmap ipfiredist ntop ipfiredist postfix ipfiredist procmail ipfiredist samba + ipfiredist spamassassin + ipfiredist web-cyradm ipfiredist xampp ipfiredist xinetd test -d $BASEDIR/packages || mkdir $BASEDIR/packages @@ -886,8 +914,17 @@ build) echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE prepareenv fi + buildbase buildipcop + + # Setzen des IPFire Builds + if [ "$FIREBUILD" ]; then + echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild + else + echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild + fi + buildinstaller buildpackages ;; @@ -973,7 +1010,6 @@ newpak) cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2 touch ROOTFILES - touch CONFFILES touch {,un}install.sh ## install.sh echo '#!/bin/bash' > install.sh @@ -1081,15 +1117,12 @@ gettoolchain) wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null 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 xfz cache/$PACKAGE.tar.gz -C . -# rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5} -# else -# exiterror "$PACKAGE.md5 did not match, check downloaded package" -# fi + 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 + else + exiterror "$PACKAGE.md5 did not match, check downloaded package" + fi fi ;; paks) @@ -1105,7 +1138,8 @@ commit) echo "Upload the changed files:" svn commit ./make.sh sync - svn up > /dev/null + clear + svn up ;; make) echo "Do a complete compile:" @@ -1182,6 +1216,12 @@ pub-paks) echo -e "There was an error while uploading the packages to the ftp server." fi ;; +build-only) + rm -f $BASEDIR/log/$2* + BUILDMACHINE=`uname -m` + prepareenv + ipcopmake $2 + ;; *) echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub-iso|pub-paks|shell|sync|toolchain|update}" cat doc/make.sh-usage