From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 15 Apr 2015 15:10:49 +0000 (+0200)
Subject: Merge branch 'next-geoip' into core-90-geoip
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6c4f090b694a8d102da5b2765dcdac871f20517;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next-geoip' into core-90-geoip
---

e6c4f090b694a8d102da5b2765dcdac871f20517
diff --cc make.sh
index 316917e0b3,395c21f2d7..6662096a94
--- a/make.sh
+++ b/make.sh
@@@ -411,8 -414,9 +414,9 @@@ buildipfire() 
  		ipfiremake backports			KCFG="-pae"
  		ipfiremake cryptodev			KCFG="-pae"
  		ipfiremake e1000e			KCFG="-pae"
 -		ipfiremake igb				KCFG="-pae"
 +#		ipfiremake igb				KCFG="-pae"
  		ipfiremake ixgbe			KCFG="-pae"
+ 		ipfiremake xtables-addons		KCFG="-pae"
  		ipfiremake linux-initrd			KCFG="-pae"
  
  		# x86 kernel build
@@@ -420,8 -424,9 +424,9 @@@
  		ipfiremake backports			KCFG=""
  		ipfiremake cryptodev			KCFG=""
  		ipfiremake e1000e			KCFG=""
 -		ipfiremake igb				KCFG=""
 +#		ipfiremake igb				KCFG=""
  		ipfiremake ixgbe			KCFG=""
+ 		ipfiremake xtables-addons		KCFG=""
  		ipfiremake linux-initrd			KCFG=""
  		;;
  
@@@ -437,8 -443,9 +443,9 @@@
  		ipfiremake backports			KCFG="-multi"
  		ipfiremake cryptodev			KCFG="-multi"
  		ipfiremake e1000e			KCFG="-multi"
 -		ipfiremake igb				KCFG="-multi"
 +#		ipfiremake igb				KCFG="-multi"
  		ipfiremake ixgbe			KCFG="-multi"
+ 		ipfiremake xtables-addons		KCFG="-multi"
  		ipfiremake linux-initrd			KCFG="-multi"
  
  		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
@@@ -446,8 -453,9 +453,9 @@@
  		ipfiremake backports			KCFG="-kirkwood"
  		ipfiremake cryptodev			KCFG="-kirkwood"
  		ipfiremake e1000e			KCFG="-kirkwood"
 -		ipfiremake igb				KCFG="-kirkwood"
 +#		ipfiremake igb				KCFG="-kirkwood"
  		ipfiremake ixgbe			KCFG="-kirkwood"
+ 		ipfiremake xtables-addons		KCFG="-kirkwood"
  		ipfiremake linux-initrd			KCFG="-kirkwood"
  		;;
    esac