Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

diff --combined make.sh
index 33c5d3d2dd3b1b14efb677692511d0813e6b203c,766499fce7b90a13e83abade314b555c0c5aa4b6..575380dbe12547248f29a3423016b8ad19330783
--- 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.15"                                                        # Version number
- CORE="85"                                                     # Core Level (Filename)
- PAKFIRE_CORE="85"                                             # Core Level (PAKFIRE)
+ VERSION="2.17"                                                        # Version number
+ CORE="87"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="86"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -36,7 -36,7 +36,7 @@@ BUILD_IMAGES=1                                                        # Flash and Xen Do
  KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
- TOOLCHAINVER=7
+ TOOLCHAINVER=8
  
  # New architecture variables
  BUILD_ARCH="$(uname -m)"
@@@ -362,7 -362,6 +362,6 @@@ buildbase() 
      lfsmake2 less
      lfsmake2 make
      lfsmake2 man
-     lfsmake2 mktemp
      lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
@@@ -377,7 -376,6 +376,6 @@@
      lfsmake2 vim
      lfsmake2 xz
      lfsmake2 paxctl
-     lfsmake2 grub
  }
  
  buildipfire() {
@@@ -398,61 -396,54 +396,54 @@@
    ipfiremake rpi-firmware
    ipfiremake bc
    ipfiremake u-boot
+   ipfiremake cpio
+   ipfiremake mdadm
+   ipfiremake dracut
+   ipfiremake lvm2
+   ipfiremake multipath-tools
+   ipfiremake freetype
+   ipfiremake grub
  
    case "${TARGET_ARCH}" in
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
- #             ipfiremake kvm-kmod                     KCFG="-pae"
- #             ipfiremake v4l-dvb                      KCFG="-pae"
- #             ipfiremake mISDN                        KCFG="-pae"
                ipfiremake cryptodev                    KCFG="-pae"
- #             ipfiremake compat-drivers               KCFG="-pae"
- #             ipfiremake r8169                        KCFG="-pae"
- #             ipfiremake r8168                        KCFG="-pae"
- #             ipfiremake r8101                        KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
+               ipfiremake ixgbe                        KCFG="-pae"
+               ipfiremake linux-initrd                 KCFG="-pae"
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
- #             ipfiremake kvm-kmod                     KCFG=""
- #             ipfiremake v4l-dvb                      KCFG=""
- #             ipfiremake mISDN                        KCFG=""
                ipfiremake cryptodev                    KCFG=""
- #             ipfiremake compat-drivers               KCFG=""
- #             ipfiremake r8169                        KCFG=""
- #             ipfiremake r8168                        KCFG=""
- #             ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
+               ipfiremake linux-initrd                 KCFG=""
                ;;
  
        armv5tel)
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
- #             ipfiremake v4l-dvb                      KCFG="-rpi"
- #             ipfiremake mISDN                        KCFG="-rpi" NOPCI=1
                ipfiremake cryptodev                    KCFG="-rpi"
- #             ipfiremake compat-drivers               KCFG="-rpi"
+               ipfiremake linux-initrd                 KCFG="-rpi"
  
                # arm multi platform (Panda, Wandboard ...) kernel build
                ipfiremake linux                        KCFG="-multi"
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
+               ipfiremake ixgbe                        KCFG="-multi"
+               ipfiremake linux-initrd                 KCFG="-multi"
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
- #             ipfiremake v4l-dvb                      KCFG="-kirkwood"
- #             ipfiremake mISDN                        KCFG="-kirkwood"
                ipfiremake cryptodev                    KCFG="-kirkwood"
- #             ipfiremake compat-drivers               KCFG="-kirkwood"
- #             ipfiremake r8169                        KCFG="-kirkwood"
- #             ipfiremake r8168                        KCFG="-kirkwood"
- #             ipfiremake r8101                        KCFG="-kirkwood"
- #             ipfiremake e1000e                       KCFG="-kirkwood"
+               ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
+               ipfiremake ixgbe                        KCFG="-kirkwood"
+               ipfiremake linux-initrd                 KCFG="-kirkwood"
                ;;
    esac
    ipfiremake pkg-config
@@@ -466,8 -457,6 +457,6 @@@
    ipfiremake dhcpcd
    ipfiremake boost
    ipfiremake linux-atm
-   ipfiremake cpio
-   ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
@@@ -486,12 -475,12 +475,12 @@@
    ipfiremake libpng
    ipfiremake libtiff
    ipfiremake libart
-   ipfiremake freetype
    ipfiremake gd
    ipfiremake popt
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
+   ipfiremake libsmooth
    ipfiremake attr
    ipfiremake acl
    ipfiremake libcap
@@@ -742,13 -731,11 +731,12 @@@
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 +  ipfiremake libsrtp
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
-   ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
@@@ -815,6 -802,8 +803,8 @@@
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
+   ipfiremake pigz
+   ipfiremake tmux
  }
  
  buildinstaller() {
@@@ -824,7 -813,6 +814,6 @@@
    ipfiremake memtest
    ipfiremake installer
    installmake strip
-   ipfiremake initrd
  }
  
  buildpackages() {
@@@ -861,6 -849,7 +850,7 @@@
    modprobe loop 2>/dev/null
    if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
+       ipfiremake flash-images SCON=1
    fi
  
    mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1