Add client175 (webif for mpd) addon.

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 4c7be21a6ca3856a119f1126b2c53a16f4e5552c..2222e773adaadf227263d95ebe73237ca28136ed 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.8test"                                              # Version number
-CORE="42"                                                      # Core Level (Filename)
-PAKFIRE_CORE="41"                                              # Core Level (PAKFIRE)
+CORE="43"                                                      # Core Level (Filename)
+PAKFIRE_CORE="42"                                              # 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
@@ -234,9 +234,12 @@ prepareenv() {
 }
 
 buildtoolchain() {
-    if [ "$MACHINE" = "x86_64" ]; then
+    if [ "$(uname -m)" = "x86_64" ]; then
         exiterror "Cannot build toolchain on x86_64. Please use the download."
     fi
+    if [ "$(uname -r | grep ipfire)" ]; then
+        exiterror "Cannot build toolchain on ipfire. Please use the download."
+    fi
 
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
@@ -678,6 +681,7 @@ buildipfire() {
   ipfiremake ddrescue
   ipfiremake tcl
   ipfiremake imspector
+  ipfiremake client175
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -687,7 +691,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