From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 Dec 2008 15:20:12 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~245^2~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=cab25d67ad7f0b0efec2332ae9dddf3c8d380e89;hp=-c

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

cab25d67ad7f0b0efec2332ae9dddf3c8d380e89
diff --combined make.sh
index f9ae0180f1,60eaf87bb8..d1eecd0ca4
--- a/make.sh
+++ b/make.sh
@@@ -334,7 -334,6 +334,7 @@@ buildipfire() 
    ipfiremake libpcap
    ipfiremake ppp
    ipfiremake rp-pppoe
 +  ipfiremake pptp
    ipfiremake unzip
    ipfiremake linux
    ipfiremake atl2
@@@ -585,6 -584,7 +585,7 @@@
    ipfiremake cryptsetup
    ipfiremake splix
    ipfiremake streamripper
+   ipfiremake sshfs
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -669,7 -669,7 +670,7 @@@ buildpackages() 
    fi
  
    # Create updater package
-   ipfiremake updater
+   #ipfiremake updater
    mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
  
    ipfirepackages