Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --combined config/rootfiles/oldcore/98/update.sh
index ec9c1aaa691fe8c6c8f92064c0754b590fc20f59,7e0cc2dc26bfd3be3874a0054355f7bce824c850..7e0cc2dc26bfd3be3874a0054355f7bce824c850
--- 1/config/rootfiles/oldcore/98/update.sh
--- 2/config/rootfiles/core/98/update.sh
+++ b/config/rootfiles/oldcore/98/update.sh
@@@ -39,7 -39,10 +39,10 @@@ extract_file
  # Bugfixes for core96 updater bugs...
  if [ -e /boot/grub/grub.conf ]; then
        # legacy grub config on xen or citrix conflicts with grub2 config
-       rm /boot/grub/grub.cfg
+       # and core96 contains an empty file
+       if [ ! -s /boot/grub/grub.cfg ]; then
+               rm /boot/grub/grub.cfg
+       fi
  fi
  
  if [ -e /boot/grub/grub.cfg ]; then

diff --combined make.sh
index bed9230da9e682ea9b3de452285f29bf3e9160ab,08178b40b9f3f937aecc6b776ea3794dd66347a2..8392e30333e417833f45b22713768712c0ff9b56
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
 -CORE="99"                                                     # Core Level (Filename)
 +CORE="100"                                                    # Core Level (Filename)
- PAKFIRE_CORE="98"                                             # Core Level (PAKFIRE)
+ PAKFIRE_CORE="99"                                             # 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=10
 +TOOLCHAINVER=11
  
  # New architecture variables
  BUILD_ARCH="$(uname -m)"
@@@ -221,7 -221,7 +221,7 @@@ prepareenv() 
      # Run LFS static binary creation scripts one by one
      export CCACHE_DIR=$BASEDIR/ccache
      export CCACHE_COMPRESS=1
 -    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"
 +    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${TARGET_ARCH}"
  
      # Remove pre-install list of installed files in case user erase some files before rebuild
      rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@@ -287,7 -287,6 +287,7 @@@ buildtoolchain() 
      lfsmake1 linux                    TOOLS=1 KCFG="-headers"
      lfsmake1 glibc
      lfsmake1 cleanup-toolchain                PASS=1
 +    lfsmake1 gcc                      PASS=L
      lfsmake1 binutils                 PASS=2
      lfsmake1 gcc                      PASS=2
      lfsmake1 ccache                   PASS=2
@@@ -331,7 -330,6 +331,7 @@@ buildbase() 
      lfsmake2 gmp
      lfsmake2 gmp-compat
      lfsmake2 mpfr
 +    lfsmake2 libmpc
      lfsmake2 file
      lfsmake2 gcc
      lfsmake2 sed
@@@ -748,7 -746,7 +748,7 @@@ buildipfire() 
    ipfiremake streamripper
    ipfiremake sshfs
    ipfiremake taglib
 -  ipfiremake mediatomb
 +  #ipfiremake mediatomb
    ipfiremake sslh
    ipfiremake perl-gettext
    ipfiremake perl-Sort-Naturally
@@@ -846,8 -844,6 +846,8 @@@
    ipfiremake swconfig
    ipfiremake haproxy
    ipfiremake ipset
 +  ipfiremake lua
 +  ipfiremake dnsdist
  }
  
  buildinstaller() {