X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=b73cc72f961883adeaa6ff4fd1c41a330262a00a;hp=30023e599a82f5242141c7d644d921ca1c3aabc7;hb=2f58be7548d3eaa772983253f03d077a6242e17e;hpb=c52603e13916f3d835b20c83df718c6f0319ca08

diff --git a/make.sh b/make.sh
index 30023e599..b73cc72f9 100755
--- 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="51"							# Core Level (Filename)
 PAKFIRE_CORE="50"						# 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
@@ -689,6 +690,7 @@ buildipfire() {
   ipfiremake parted
   ipfiremake swig
   ipfiremake python-m2crypto
+  ipfiremake wireless-regdb
   ipfiremake crda
   ipfiremake libsatsolver
   ipfiremake python-distutils-extra
@@ -706,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