Merge remote-tracking branch 'origin/next' into kernel-4.14

diff --combined make.sh
index 8c40bf635eaaf45a09713daebe6576faf3046ca9,3f10ffaec53a9fe5c11c280419da3fae4a6f40c9..831faa728bf31266b7f062366f547539ab49e1ed
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -537,7 -537,7 +537,7 @@@ entershell() 
        fi
  
        echo "Entering to a shell inside LFS chroot, go out with exit"
-       local PS1="ipfire build chroot ($(uname -m)) \u:\w\$ "
+       local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "
  
        if enterchroot bash -i; then
                stdumount
@@@ -1042,10 -1042,11 +1042,10 @@@ buildipfire() 
    lfsmake2 unzip
    lfsmake2 which
    lfsmake2 linux-firmware
 -  lfsmake2 ath10k-firmware
    lfsmake2 dvb-firmwares
 -  lfsmake2 mt7601u-firmware
    lfsmake2 zd1211-firmware
    lfsmake2 rpi-firmware
 +  lfsmake2 intel-microcode
    lfsmake2 bc
    lfsmake2 u-boot
    lfsmake2 cpio
@@@ -1062,34 -1063,33 +1062,34 @@@
    lfsmake2 libnetfilter_cthelper
    lfsmake2 libnetfilter_cttimeout
    lfsmake2 iptables
 +  lfsmake2 elfutils
  
    case "${BUILD_ARCH}" in
        x86_64)
                lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
 +#             lfsmake2 backports                      KCFG=""
 +#             lfsmake2 e1000e                 KCFG=""
 +#             lfsmake2 igb                            KCFG=""
 +#             lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                lfsmake2 linux                  KCFG="-pae"
 -              lfsmake2 backports                      KCFG="-pae"
 -              lfsmake2 e1000e                 KCFG="-pae"
 -              lfsmake2 igb                            KCFG="-pae"
 -              lfsmake2 ixgbe                  KCFG="-pae"
 +#             lfsmake2 backports                      KCFG="-pae"
 +#             lfsmake2 e1000e                 KCFG="-pae"
 +#             lfsmake2 igb                            KCFG="-pae"
 +#             lfsmake2 ixgbe                  KCFG="-pae"
                lfsmake2 xtables-addons         KCFG="-pae"
                lfsmake2 linux-initrd                   KCFG="-pae"
  
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
 +#             lfsmake2 backports                      KCFG=""
 +#             lfsmake2 e1000e                 KCFG=""
 +#             lfsmake2 igb                            KCFG=""
 +#             lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
@@@ -1120,6 -1120,7 +1120,7 @@@
                lfsmake2 linux-initrd                   KCFG="-kirkwood"
                ;;
    esac
+   lfsmake2 intel-microcode
    lfsmake2 xtables-addons                     USPACE="1"
    lfsmake2 openssl
    [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
@@@ -1178,7 -1179,6 +1179,6 @@@
    lfsmake2 cyrus-sasl
    lfsmake2 openldap
    lfsmake2 apache2
-   lfsmake2 php
    lfsmake2 web-user-interface
    lfsmake2 flag-icons
    lfsmake2 jquery
@@@ -1410,7 -1410,6 +1410,6 @@@
    lfsmake2 streamripper
    lfsmake2 sshfs
    lfsmake2 taglib
-   #lfsmake2 mediatomb
    lfsmake2 sslh
    lfsmake2 perl-gettext
    lfsmake2 perl-Sort-Naturally
@@@ -1469,6 -1468,7 +1468,6 @@@
    lfsmake2 sendEmail
    lfsmake2 sysbench
    lfsmake2 strace
 -  lfsmake2 elfutils
    lfsmake2 ltrace
    lfsmake2 ipfire-netboot
    lfsmake2 lcdproc
@@@ -1488,7 -1488,6 +1487,6 @@@
    lfsmake2 iptraf-ng
    lfsmake2 iotop
    lfsmake2 stunnel
-   lfsmake2 owncloud
    lfsmake2 bacula
    lfsmake2 batctl
    lfsmake2 perl-Font-TTF
@@@ -1518,6 -1517,7 +1516,7 @@@
    lfsmake2 perl-Net-IP
    lfsmake2 wio
    lfsmake2 iftop
+   lfsmake2 mdns-repeater
  }
  
  buildinstaller() {