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

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 10bbb8e557bee39184a75598d4ba0a40311f3f06..9d93f071e3c0a8bce7170bba7304c92bd9d2a90d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -442,7 +442,7 @@ buildipfire() {
     ipfiremake r8169                   KCFG="-kirkwood"
     ipfiremake r8168                   KCFG="-kirkwood"
     ipfiremake r8101                   KCFG="-kirkwood"
-    ipfiremake e1000e                  KCFG="-kirkwood"
+#    ipfiremake e1000e                 KCFG="-kirkwood"
     ipfiremake igb                     KCFG="-kirkwood"
 
   fi
@@ -771,6 +771,7 @@ buildipfire() {
   ipfiremake bitstream
   ipfiremake multicat
   ipfiremake keepalived
+  ipfiremake ipvsadm
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -949,6 +950,7 @@ build)
 
        cd $BASEDIR
        tools/checknewlog.pl
+       tools/checkwronginitlinks
        cd $PWD
 
        beautify build_end