Merge branch 'master' into upnp

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 331479dab22665a9bc9bc052b36db6d9e056ca47..13672542f315e1a8e7231d79b6f2ae1bbcb869a3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -227,6 +227,10 @@ prepareenv() {
 }
 
 buildtoolchain() {
+    if [ "$(uname -m)" = "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,6 +652,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
@@ -789,7 +794,7 @@ ipfirepackages() {
 case "$1" in 
 build)
        clear
-       BUILDMACHINE=`uname -m`
+       BUILDMACHINE="i686"
        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
@@ -917,7 +922,7 @@ toolchain)
        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain
-       BUILDMACHINE=`uname -m`
+       BUILDMACHINE="i686"
        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 \
@@ -929,7 +934,7 @@ toolchain)
        stdumount
        ;;
 gettoolchain)
-       BUILDMACHINE=`uname -m`
+       BUILDMACHINE="i686"
        # 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