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

diff --combined make.sh
index e6a648b563f4c866cc458a6e5b7118b83c45a744,b54499d33adfce2c35b4fab4651a9edb8718887b..6ea9b593bdf1eb890cc82f7a3991f47dc15f5c0d
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -418,8 -418,6 +418,8 @@@ buildipfire() 
  #             ipfiremake r8101                        KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
 +              ipfiremake ixgbe                        KCFG="-pae"
 +
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
@@@ -433,7 -431,6 +433,7 @@@
  #             ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
 +              ipfiremake ixgbe                        KCFG=""
                ;;
  
        armv5tel)
@@@ -449,7 -446,6 +449,7 @@@
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
 +              ipfiremake ixgbe                        KCFG="-multi"
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
@@@ -460,9 -456,8 +460,9 @@@
  #             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"
                ;;
    esac
    ipfiremake pkg-config
@@@ -822,6 -817,7 +822,7 @@@
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
    ipfiremake pigz
+   ipfiremake tmux
  }
  
  buildinstaller() {