From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 3 Dec 2011 09:23:47 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=6c22de5561913d751954df791ebf29e00c33f867

Merge branch 'next'

Conflicts:
	lfs/e1000
	lfs/e1000e
	lfs/igb
	lfs/lcd4linux
---

6c22de5561913d751954df791ebf29e00c33f867
diff --cc make.sh
index 9f8678f7a,f8043b81b..f59678d71
--- a/make.sh
+++ b/make.sh
@@@ -712,10 -751,10 +751,10 @@@ 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
- 	echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
 -  if [ "$GIT_BRANCH" = "next" ]; then
++  if [ "$GIT_BRANCH" = "master" -o "$GIT_BRANCH" = "next" ]; then
+ 	echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
    else
- 	echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+ 	echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
    fi
  }