X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=6d1e423905537ee788afe62917f7515ac4d35376;hp=37a46003f3c50c15755e958b1f317574c5e630b9;hb=1d43a0fb89f66c94a4e96f005ddd694c1a402385;hpb=3e0cef2a2673b6c434e10bc656b99a5feb550ff4

diff --git a/make.sh b/make.sh
index 37a46003f3..6d1e423905 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.9beta1"						# Version number
-CORE="43"							# Core Level (Filename)
-PAKFIRE_CORE="43"						# Core Level (PAKFIRE)
+VERSION="2.10"							# Version number
+CORE="50"							# Core Level (Filename)
+PAKFIRE_CORE="49"						# 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
@@ -247,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
@@ -270,7 +271,7 @@ buildtoolchain() {
     lfsmake1 grep
     lfsmake1 gzip
     lfsmake1 m4
-    lfsmake1 make
+    lfsmake1 make	PASS=2
     lfsmake1 patch
     lfsmake1 perl
     lfsmake1 sed
@@ -357,6 +358,7 @@ buildipfire() {
   ipfiremake which
   ipfiremake xz
   ipfiremake linux-firmware
+  ipfiremake zd1211-firmware
   ipfiremake linux			XEN=1
   ipfiremake kqemu			XEN=1
   ipfiremake v4l-dvb			XEN=1
@@ -365,9 +367,9 @@ buildipfire() {
   ipfiremake dahdi			XEN=1 KMOD=1
   ipfiremake cryptodev			XEN=1
   ipfiremake compat-wireless		XEN=1
-#  ipfiremake r8169			XEN=1
-#  ipfiremake r8168			XEN=1
-#  ipfiremake r8101			XEN=1
+  ipfiremake r8169			XEN=1
+  ipfiremake r8168			XEN=1
+  ipfiremake r8101			XEN=1
   ipfiremake e1000			XEN=1
   ipfiremake e1000e			XEN=1
   ipfiremake igb			XEN=1
@@ -416,6 +418,8 @@ buildipfire() {
   ipfiremake pam
   ipfiremake openssl
   ipfiremake curl
+  ipfiremake tcl
+  ipfiremake sqlite
   ipfiremake python
   ipfiremake fireinfo
   ipfiremake libnet
@@ -649,7 +653,6 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
-  ipfiremake sqlite
   ipfiremake taglib
   ipfiremake mediatomb
   ipfiremake sslh
@@ -680,10 +683,23 @@ buildipfire() {
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
-  ipfiremake tcl
   ipfiremake imspector
   ipfiremake miniupnpd
   ipfiremake client175
+  ipfiremake powertop
+  ipfiremake parted
+  ipfiremake swig
+  ipfiremake python-m2crypto
+  ipfiremake wireless-regdb
+  ipfiremake crda
+  ipfiremake libsatsolver
+  ipfiremake python-satsolver
+  ipfiremake python-distutils-extra
+  ipfiremake python-lzma
+  ipfiremake python-progressbar
+  ipfiremake python-xattr
+  ipfiremake intltool
+  ipfiremake pakfire3-deps
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -693,7 +709,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
@@ -761,6 +777,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/*
@@ -837,8 +859,10 @@ build)
 	buildpackages
 	
 	beautify build_stage "Checking Logfiles for new Files"
-	cd ..
+
+	cd $BASEDIR
 	tools/checknewlog.pl
+	cd $PWD
 
 	beautify build_end
 	;;
@@ -870,6 +894,7 @@ clean)
 	if [ -h /tools ]; then
 		rm -f /tools
 	fi
+	rm -f $BASEDIR/ipfire-*
 	beautify message DONE
 	;;
 downloadsrc)