Revert "Next try to enable PAE support."

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

diff --git a/make.sh b/make.sh
index 1e962ea8d986ca56c44a0fb790ad08c1b720d44e..cc1f540d4ea8cee2b4aa80c219188988dd2948e1 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,6 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.3"
+CORE="27"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -503,10 +504,6 @@ buildipfire() {
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
-  ipfiremake icecast
-  ipfiremake icegenerator
-  ipfiremake mpd
-  ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
   ipfiremake cmake
@@ -561,6 +558,10 @@ buildipfire() {
   ipfiremake videolan
   ipfiremake vdr
   ipfiremake w_scan
+  ipfiremake icecast
+  ipfiremake icegenerator
+  ipfiremake mpd
+  ipfiremake mpc
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
@@ -571,7 +572,7 @@ buildipfire() {
   ipfiremake hostapd
   ipfiremake urlgrabber
   ipfiremake syslinux
-  ipfiremake tftp-hpa
+  ipfiremake tftpd
   ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
@@ -585,8 +586,6 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
-  ipfiremake libdlna
-  ipfiremake ushare
   ipfiremake sqlite
   ipfiremake taglib
   ipfiremake mediatomb
@@ -599,6 +598,7 @@ buildipfire() {
   git status >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
+  echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 }
 
 buildinstaller() {
@@ -867,7 +867,7 @@ gettoolchain)
                test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
                echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
                cd $BASEDIR/cache/toolchains
-               wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
+               wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
                if [ $? -ne 0 ]; then
                        echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
                else