Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Dec 2011 09:23:47 +0000 (10:23 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Dec 2011 09:23:47 +0000 (10:23 +0100)
Conflicts:
lfs/e1000
lfs/e1000e
lfs/igb
lfs/lcd4linux

1  2 
make.sh

diff --cc make.sh
index 9f8678f7a4c9d0572f10f741fba58f81124bcc58,f8043b81baf3fac1ea587e6abdd6a5d76764290e..f59678d71a854c2f8926ba5edf4493a227190225
+++ 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
  }