Merge branch 'master' into upnp

diff --combined make.sh
index 2def8ff41cf2e7cf9822b32c1989753dd6d6362b,fc3d9387781db19251a740e04ce1aab97ea7c767..fa13d0d796050a4c70a37f7e346e3d8e01a04757
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -40,6 -40,13 +40,13 @@@ GIT_LASTCOMMIT=$(git log | head -n1 | c
  TOOLCHAINVER=3
  IPFVER="full"                         # Which versions should be compiled? (full|devel)
  
+ BUILDMACHINE=$MACHINE
+     if [ "$MACHINE" = "x86_64" ]; then
+         BUILDMACHINE="i686";
+         linux32="linux32";
+     fi
+ 
+ 
  # Debian specific settings
  if [ ! -e /etc/debian_version ]; then
        FULLPATH=`which $0`
@@@ -227,6 -234,10 +234,10 @@@ prepareenv() 
  }
  
  buildtoolchain() {
+     if [ "$MACHINE" = "x86_64" ]; then
+         exiterror "Cannot build toolchain on x86_64. Please use the download."
+     fi
+ 
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
      ORG_PATH=$PATH
@@@ -648,7 -659,6 +659,7 @@@ buildipfire() 
    ipfiremake minicom
    ipfiremake ddrescue
    ipfiremake imspector
 +  ipfiremake miniupnpd
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -790,7 -800,6 +801,6 @@@ ipfirepackages() 
  case "$1" in 
  build)
        clear
-       BUILDMACHINE=`uname -m`
        PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@@ -918,7 -927,6 +928,6 @@@ toolchain
        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain
-       BUILDMACHINE=`uname -m`
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
        cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@@ -930,7 -938,6 +939,6 @@@
        stdumount
        ;;
  gettoolchain)
-       BUILDMACHINE=`uname -m`
        # arbitrary name to be updated in case of new toolchain package upload
        PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
        if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then