Merge remote-tracking branch 'ummeegge/ovpn-firewall-fixes' into next

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

diff --git a/make.sh b/make.sh
index 09349098aa467848bbcba8bb0ddd5d952b0c4ef9..8c2bb0d0e8aa3306adb1ca526c28cb653f634dc6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.13"                                                 # Version number
+VERSION="2.13beta2"                                                    # Version number
 CORE="65"                                                      # Core Level (Filename)
 PAKFIRE_CORE="65"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
@@ -509,7 +509,9 @@ buildipfire() {
   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
+  ipfiremake libmnl
   ipfiremake iptables
+  ipfiremake conntrack-tools
   ipfiremake libupnp
   ipfiremake ipaddr
   ipfiremake iputils
@@ -588,6 +590,7 @@ buildipfire() {
   ipfiremake ghostscript
   ipfiremake foomatic
   ipfiremake hplip
+  ipfiremake cifs-utils
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -750,6 +753,7 @@ buildipfire() {
   ipfiremake stress
   ipfiremake libstatgrab
   ipfiremake sarg
+  ipfiremake fstrim
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -760,7 +764,7 @@ buildipfire() {
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
   case "$GIT_BRANCH" in
-       core*)
+       core*|beta?|rc?)
            echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
            ;;
        *)