Merge remote-tracking branch 'origin/core60' into next

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

diff --git a/make.sh b/make.sh
index 6b1c93d313c264907d0f4ff4825bfd9dc33ead1c..89f979d95b7ec36b8112595900c89a10640b44ef 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
-CORE="60"                                                      # Core Level (Filename)
+CORE="61"                                                      # Core Level (Filename)
 PAKFIRE_CORE="60"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -572,6 +572,7 @@ buildipfire() {
   ipfiremake Locale-Country
   ipfiremake XML-Parser
   ipfiremake Crypt-PasswdMD5
+  ipfiremake Net-Telnet
   ipfiremake python-setuptools
   ipfiremake python-clientform
   ipfiremake python-mechanize
@@ -764,6 +765,8 @@ buildipfire() {
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
+  ipfiremake mtr
+  ipfiremake tcpick
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild