Don't provide ssh keys in the update to 2.3.

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

diff --git a/make.sh b/make.sh
index edab59a747d6bbe6abe195bfea8cd3a7a8e155f2..4359b01e0f526abd0d71db7a6dc6a4bd1de78b6a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-rc1"
+VERSION="2.3"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -177,7 +177,9 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j6"
+    if [ -z $MAKETUNING ]; then
+       MAKETUNING="-j6"
+    fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -350,7 +352,7 @@ buildipfire() {
   ipfiremake gdbm
   ipfiremake gmp
   ipfiremake pam
-  ipfiremake openssl                   PADLOCK=1
+  ipfiremake openssl
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet
@@ -578,6 +580,7 @@ buildipfire() {
   ipfiremake iperf
   ipfiremake netcat
   ipfiremake 7zip
+  ipfiremake lynis
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild