From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 30 May 2011 10:38:10 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~103
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e32571f0316a01ea940145287a5588640e3a3c2c;hp=-c

Merge branch 'master' into next

Conflicts:
	make.sh
---

e32571f0316a01ea940145287a5588640e3a3c2c
diff --combined make.sh
index 5f595e86f2,54f3aec7f7..4a7e374613
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.9"							# Version number
 +VERSION="2.10"							# Version number
- CORE="49"							# Core Level (Filename)
- PAKFIRE_CORE="48"						# Core Level (PAKFIRE)
+ CORE="50"							# Core Level (Filename)
+ PAKFIRE_CORE="49"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
  CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@@ -358,7 -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
@@@ -692,7 -691,6 +692,7 @@@
    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
@@@ -702,7 -700,7 +702,7 @@@
    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