X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=b2eea710429706a6a15cc9960677b0971c1123b1;hp=7ae50022b3848fff55d7a58d8c68b93c5a623378;hb=599d475a53aa6050014fd1f347f2ace43d955dde;hpb=c60fa4138d8a4dd4723e2758f27f65f9a5471f3d

diff --git a/make.sh b/make.sh
index 7ae50022b..b2eea7104 100755
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.9"							# Version number
-CORE="51"							# Core Level (Filename)
+VERSION="2.10"							# Version number
+CORE="52"							# Core Level (Filename)
 PAKFIRE_CORE="51"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
@@ -693,7 +693,6 @@ buildipfire() {
   ipfiremake wireless-regdb
   ipfiremake crda
   ipfiremake libsatsolver
-  ipfiremake python-satsolver
   ipfiremake python-distutils-extra
   ipfiremake python-lzma
   ipfiremake python-progressbar
@@ -709,7 +708,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