Merge commit 'origin/master' into next

diff --combined make.sh
index 4bec05b9bf29432da98900b08047e451ebe41e26,b8035b68fb84c8f553bf6bb202979f5cd796f23a..36211fec68bb14a19402f2fd703c758e7f75f438
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.7"                                                 # Version number
 +VERSION="2.8test"                                             # Version number
  CORE="42"                                                     # Core Level (Filename)
- PAKFIRE_CORE="41"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -37,16 -37,9 +37,16 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
 -TOOLCHAINVER=3
 +TOOLCHAINVER=1
  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`
@@@ -234,13 -227,6 +234,13 @@@ prepareenv() 
  }
  
  buildtoolchain() {
 +    if [ "$(uname -m)" = "x86_64" ]; then
 +        exiterror "Cannot build toolchain on x86_64. Please use the download."
 +    fi
 +    if [ "$(uname -r | grep ipfire)" ]; then
 +        exiterror "Cannot build toolchain on ipfire. Please use the download."
 +    fi
 +
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
      ORG_PATH=$PATH
@@@ -372,22 -358,6 +372,22 @@@ buildipfire() 
    ipfiremake e1000                    XEN=1
    ipfiremake e1000e                   XEN=1
    ipfiremake igb                      XEN=1
 +  ipfiremake linux                    PAE=1
 +  ipfiremake kqemu                    PAE=1
 +  ipfiremake kvm-kmod                 PAE=1
 +  ipfiremake v4l-dvb                  PAE=1
 +  ipfiremake madwifi                  PAE=1
 +  ipfiremake alsa                     PAE=1 KMOD=1
 +  ipfiremake mISDN                    PAE=1
 +  ipfiremake dahdi                    PAE=1 KMOD=1
 +  ipfiremake cryptodev                        PAE=1
 +  ipfiremake compat-wireless          PAE=1
 +  ipfiremake r8169                    PAE=1
 +  ipfiremake r8168                    PAE=1
 +  ipfiremake r8101                    PAE=1
 +  ipfiremake e1000                    PAE=1
 +  ipfiremake e1000e                   PAE=1
 +  ipfiremake igb                      PAE=1
    ipfiremake linux
    ipfiremake kqemu
    ipfiremake kvm-kmod
@@@ -407,10 -377,9 +407,10 @@@
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio
 -  ipfiremake klibc
 -  ipfiremake mkinitcpio
 -  ipfiremake udev                     KLIBC=1
 +
 +  installmake strip
 +
 +  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake gmp
@@@ -431,7 -400,6 +431,7 @@@
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake attr
    ipfiremake libcap
    ipfiremake pciutils
    ipfiremake usbutils
@@@ -450,6 -418,7 +450,6 @@@
    ipfiremake cdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
 -  ipfiremake squashfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
    ipfiremake sysfsutils
@@@ -672,14 -641,12 +672,14 @@@
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
 +  ipfiremake usb_modeswitch_data
    ipfiremake zerofree
    ipfiremake mdadm
    ipfiremake eject
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
 +  ipfiremake tcl
    ipfiremake imspector
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
@@@ -704,10 -671,34 +704,10 @@@ buildinstaller() 
    ipfiremake as86
    ipfiremake mbr
    ipfiremake memtest
 -  installmake linux-libc-header
 -  installmake binutils
 -  ipfiremake uClibc                   PASS=1
 -  ipfiremake gcc                      INST=1
 -  installmake uClibc                  PASS=2
 -  installmake gcc                     INST=2
 -  installmake uClibc                  PASS=3
 -  installmake busybox
 -  installmake udev
 -  installmake slang
 -  installmake newt
 -  installmake gettext
 -  installmake kbd
 -  installmake popt
 -  installmake sysvinit
 -  installmake misc-progs
 -  installmake reiserfsprogs
 -  installmake sysfsutils
 -  installmake util-linux
 -  installmake pciutils
 -  installmake zlib
 -  installmake mtd
 -  installmake wget
 -  installmake hwdata
 -  installmake kudzu
 -  installmake pcmciautils
 -  installmake installer
 -  installmake initrd
 +  ipfiremake installer
 +  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
 +  installmake strip
 +  ipfiremake initrd
  }
  
  buildpackages() {
@@@ -715,6 -706,7 +715,6 @@@
    export LOGFILE
    echo "... see detailed log in _build.*.log files" >> $LOGFILE
  
 -  installmake strip
    
    # Generating list of packages used
    echo -n "Generating packages list from logs" | tee -a $LOGFILE
@@@ -797,6 -789,7 +797,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
@@@ -924,6 -917,7 +924,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 \
@@@ -935,6 -929,7 +935,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