Merge branch 'next-geoip' into core-90-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 15 Apr 2015 15:10:49 +0000 (17:10 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 15 Apr 2015 15:10:49 +0000 (17:10 +0200)
1  2 
config/rootfiles/common/stage2
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/stage2
make.sh

Simple merge
Simple merge
Simple merge
diff --cc lfs/stage2
Simple merge
diff --cc 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
                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=""
                ;;
  
                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
                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