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

make.sh

@@ -585,6 +585,7 @@ buildipfire() {
   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 +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