Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 14 Feb 2015 11:34:31 +0000 (12:34 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 14 Feb 2015 11:34:31 +0000 (12:34 +0100)
Conflicts:
make.sh

1  2 
config/firewall/rules.pl
config/rootfiles/common/stage2
lfs/stage2
make.sh

@@@ -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 lfs/stage2
Simple merge
diff --cc 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
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
 +  ipfiremake perl-Text-CSV_XS
+   ipfiremake swconfig
  }
  
  buildinstaller() {