Merge remote-tracking branch 'jlentfer/swatch' into next

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

diff --git a/make.sh b/make.sh
index 757acec52f7b4563b66752b6d4dd7ea1d4df7e8b..c6ef5df928bfdc88949465ae907d8207505a8702 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="69"                                                      # Core Level (Filename)
+CORE="70"                                                      # Core Level (Filename)
 PAKFIRE_CORE="69"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -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
@@ -462,6 +462,7 @@ buildipfire() {
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
+  ipfiremake nasm
   ipfiremake libjpeg
   ipfiremake libexif
   ipfiremake libpng
@@ -523,7 +524,6 @@ buildipfire() {
   ipfiremake logwatch
   ipfiremake misc-progs
   ipfiremake nano
-  ipfiremake nasm
   ipfiremake URI
   ipfiremake HTML-Tagset
   ipfiremake HTML-Parser
@@ -768,6 +768,10 @@ buildipfire() {
   ipfiremake strace
   ipfiremake ipfire-netboot
   ipfiremake lcdproc
+  ipfiremake bitstream
+  ipfiremake multicat
+  ipfiremake keepalived
+  ipfiremake ipvsadm
   ipfiremake perl-Carp-Clan
   ipfiremake perl-Date-Calc
   ipfiremake perl-Date-Manip
@@ -952,6 +956,7 @@ build)
 
        cd $BASEDIR
        tools/checknewlog.pl
+       tools/checkwronginitlinks
        cd $PWD
 
        beautify build_end