X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=ccb1dbca44dc58205b543c764ba6fc139be1fac3;hb=bc481fef281da3512ae10fd1f8810244c0586c74;hp=4c7be21a6ca3856a119f1126b2c53a16f4e5552c;hpb=c331896e29394556a9e620147212d52cf55e70d5;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 4c7be21a6c..ccb1dbca44 100755
--- a/make.sh
+++ b/make.sh
@@ -17,16 +17,16 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.8test"						# Version number
-CORE="42"							# Core Level (Filename)
-PAKFIRE_CORE="41"						# Core Level (PAKFIRE)
+VERSION="2.10"							# Version number
+CORE="49"							# Core Level (Filename)
+PAKFIRE_CORE="48"						# 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
@@ -244,6 +247,7 @@ buildtoolchain() {
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
     export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
     lfsmake1 ccache	PASS=1
+    lfsmake1 make	PASS=1
     lfsmake1 binutils	PASS=1
     lfsmake1 gcc		PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -267,7 +271,7 @@ buildtoolchain() {
     lfsmake1 grep
     lfsmake1 gzip
     lfsmake1 m4
-    lfsmake1 make
+    lfsmake1 make	PASS=2
     lfsmake1 patch
     lfsmake1 perl
     lfsmake1 sed
@@ -324,7 +328,6 @@ buildbase() {
     lfsmake2 man
     lfsmake2 mktemp
     lfsmake2 module-init-tools
-    lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -379,9 +382,9 @@ buildipfire() {
   ipfiremake dahdi			PAE=1 KMOD=1
   ipfiremake cryptodev			PAE=1
   ipfiremake compat-wireless		PAE=1
-  ipfiremake r8169			PAE=1
-  ipfiremake r8168			PAE=1
-  ipfiremake r8101			PAE=1
+#  ipfiremake r8169			PAE=1
+#  ipfiremake r8168			PAE=1
+#  ipfiremake r8101			PAE=1
   ipfiremake e1000			PAE=1
   ipfiremake e1000e			PAE=1
   ipfiremake igb			PAE=1
@@ -395,9 +398,9 @@ buildipfire() {
   ipfiremake dahdi			KMOD=1
   ipfiremake cryptodev
   ipfiremake compat-wireless
-  ipfiremake r8169
-  ipfiremake r8168
-  ipfiremake r8101
+#  ipfiremake r8169
+#  ipfiremake r8168
+#  ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
   ipfiremake igb
@@ -415,6 +418,7 @@ buildipfire() {
   ipfiremake openssl
   ipfiremake curl
   ipfiremake python
+  ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
@@ -429,6 +433,7 @@ buildipfire() {
   ipfiremake slang
   ipfiremake newt
   ipfiremake attr
+  ipfiremake acl
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -516,6 +521,8 @@ buildipfire() {
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
+  ipfiremake libdnet
+  ipfiremake daq
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
@@ -569,8 +576,6 @@ buildipfire() {
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
-  ipfiremake ocaml
-  ipfiremake mldonkey
   ipfiremake libtorrent
   ipfiremake rtorrent
   ipfiremake ipfireseeder
@@ -678,6 +683,15 @@ buildipfire() {
   ipfiremake ddrescue
   ipfiremake tcl
   ipfiremake imspector
+  ipfiremake miniupnpd
+  ipfiremake client175
+  ipfiremake powertop
+  ipfiremake parted
+  ipfiremake swig
+  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
@@ -687,7 +701,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
@@ -755,6 +769,12 @@ buildpackages() {
   fi
   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
+  cd $BASEDIR
+  for i in `ls *.bz2 *.img.gz *.iso`; do
+	md5sum $i > $i.md5
+  done
+  cd $PWD
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -831,8 +851,10 @@ build)
 	buildpackages
 	
 	beautify build_stage "Checking Logfiles for new Files"
-	cd ..
+
+	cd $BASEDIR
 	tools/checknewlog.pl
+	cd $PWD
 
 	beautify build_end
 	;;
@@ -864,6 +886,7 @@ clean)
 	if [ -h /tools ]; then
 		rm -f /tools
 	fi
+	rm -f $BASEDIR/ipfire-*
 	beautify message DONE
 	;;
 downloadsrc)