Merge branch 'fireinfo'

diff --combined make.sh
index a3671e9e5abfdfb0a9f9ed97a27d68329e166484,36ac68f7ff9f7fcf1c93522116259b769f8c4bb4..67163f4800b2ae7867bad6d308af6480e38cca8f
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.7"                                                 # Version number
 +VERSION="2.8test"                                             # Version number
  CORE="43"                                                     # Core Level (Filename)
  PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -37,7 -37,7 +37,7 @@@ 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
@@@ -234,12 -234,9 +234,12 @@@ prepareenv() 
  }
  
  buildtoolchain() {
 -    if [ "$MACHINE" = "x86_64" ]; then
 +    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
@@@ -327,6 -324,7 +327,6 @@@ buildbase() 
      lfsmake2 man
      lfsmake2 mktemp
      lfsmake2 module-init-tools
 -    lfsmake2 mtd
      lfsmake2 net-tools
      lfsmake2 patch
      lfsmake2 psmisc
@@@ -371,22 -369,6 +371,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
@@@ -406,10 -388,9 +406,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
@@@ -417,6 -398,7 +417,7 @@@
    ipfiremake openssl
    ipfiremake curl
    ipfiremake python
+   ipfiremake fireinfo
    ipfiremake libnet
    ipfiremake libnl
    ipfiremake libidn
@@@ -430,7 -412,6 +431,7 @@@
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake attr
    ipfiremake libcap
    ipfiremake pciutils
    ipfiremake usbutils
@@@ -449,6 -430,7 +450,6 @@@
    ipfiremake cdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
 -  ipfiremake squashfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
    ipfiremake sysfsutils
@@@ -671,17 -653,14 +672,17 @@@
    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
    ipfiremake miniupnpd
 +  ipfiremake client175
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -705,10 -684,34 +706,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() {
@@@ -716,6 -719,7 +717,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