From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 2 Nov 2014 08:38:23 +0000 (+0100)
Subject: Merge branch 'seventeen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen
X-Git-Tag: v2.17-core87~103^2~32^2~1
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1bbc591d4dcce94f85bc7f1de7d49f4a42d828b6;hp=-c

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

1bbc591d4dcce94f85bc7f1de7d49f4a42d828b6
diff --combined make.sh
index e6a648b563,b54499d33a..6ea9b593bd
--- a/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() {