From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 14 Feb 2015 11:34:31 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip
X-Git-Tag: v2.17-core91~128^2~6^2~12^2~3
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=bc9446c65ff048ebce8c0665cc0efe2231fb37de

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

Conflicts:
	make.sh
---

bc9446c65ff048ebce8c0665cc0efe2231fb37de
diff --cc config/firewall/rules.pl
index 834e248716,97b8897af8..cd2f3a6359
mode 100644,100755..100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
diff --cc config/rootfiles/common/stage2
index cbfde185c8,663aef57ae..4e8b750c8b
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@@ -136,9 -143,7 +143,8 @@@ usr/share/doc/licenses/GPLv
  #usr/share/man/man8
  #usr/share/misc
  #usr/share/terminfo
 +#usr/share/xt_geoip
  #usr/share/zoneinfo
- run
  #var
  #var/cache
  var/empty
diff --cc make.sh
index d4899f9a37,92edf78cea..9f77df59be
--- a/make.sh
+++ b/make.sh
@@@ -431,8 -428,8 +433,9 @@@ buildipfire() 
  	armv5tel)
  		# arm-rpi (Raspberry Pi) kernel build
  		ipfiremake linux			KCFG="-rpi"
+ 		ipfiremake backports			KCFG="-rpi"
  		ipfiremake cryptodev			KCFG="-rpi"
 +		ipfiremake xtables-addons		KCFG="-rpi"
  		ipfiremake linux-initrd			KCFG="-rpi"
  
  		# arm multi platform (Panda, Wandboard ...) kernel build
@@@ -810,7 -809,7 +815,8 @@@
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
 +  ipfiremake perl-Text-CSV_XS
+   ipfiremake swconfig
  }
  
  buildinstaller() {