Merge branch 'master' into next

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

diff --git a/make.sh b/make.sh
index 54f3aec7f7b78d581ba13de29441e951cbb36ce4..4a7e374613b95500969f57cfb7fd30403d68acaf 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.9"                                                  # Version number
+VERSION="2.10"                                                 # Version number
 CORE="50"                                                      # Core Level (Filename)
 PAKFIRE_CORE="49"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
@@ -358,6 +358,7 @@ buildipfire() {
   ipfiremake which
   ipfiremake xz
   ipfiremake linux-firmware
+  ipfiremake zd1211-firmware
   ipfiremake linux                     XEN=1
   ipfiremake kqemu                     XEN=1
   ipfiremake v4l-dvb                   XEN=1
@@ -691,6 +692,7 @@ buildipfire() {
   ipfiremake python-m2crypto
   ipfiremake crda
   ipfiremake libsatsolver
+  ipfiremake python-satsolver
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -700,7 +702,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "master" ]; then
+  if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release