X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=849fb7de8968f7395ea98a9297fb804298771096;hp=fed147e44b22d71118addfcbbe8466c9d9c69043;hb=74dbbc36997f9c9c1ccc2f955dbcdafe82c9f369;hpb=97de2cae62f9d8bf61681561211fa8170d0808e2

diff --git a/make.sh b/make.sh
index fed147e44b..849fb7de89 100644
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
-IPFVER="full devel"				# Which version should be compiled? (full|light|voice|devel)
+IPFVER="full"				# Which versions should be compiled? (full|light|voice|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j12"
+    MAKETUNING="-j4"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -284,7 +284,6 @@ buildbase() {
     lfsmake2 file
     lfsmake2 findutils
     lfsmake2 flex
-    lfsmake2 grub
     lfsmake2 gawk
     lfsmake2 gettext
     lfsmake2 grep
@@ -294,6 +293,7 @@ buildbase() {
     lfsmake2 iproute2
     lfsmake2 kbd
     lfsmake2 less
+    lfsmake2 libaal
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
@@ -301,6 +301,7 @@ buildbase() {
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
+    lfsmake2 reiser4progs
     lfsmake2 shadow
     lfsmake2 sysklogd
     lfsmake2 sysvinit
@@ -309,6 +310,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
+    lfsmake2 grub
 }
 
 buildipfire() {
@@ -333,6 +335,7 @@ buildipfire() {
   ipfiremake fcpci			SMP=1
 #  ipfiremake promise-sata-300-tx	SMP=1
   ipfiremake zaptel			SMP=1
+  ipfiremake fuse			SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake fcdsl
@@ -343,6 +346,9 @@ buildipfire() {
   ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
+  ipfiremake fuse
+  ipfiremake pkg-config
+  ipfiremake cpio
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -378,20 +384,27 @@ buildipfire() {
   ipfiremake capi4k-utils
   ipfiremake cdrtools
   ipfiremake dnsmasq
+  ipfiremake libaal
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake squashfstools
+  ipfiremake sysfsutils
+  ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
   ipfiremake GD
+  ipfiremake GD-Graph
+  ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod
   ipfiremake initscripts
+  ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p			IPT=1
+  ipfiremake moblock
   ipfiremake linux-igd
   ipfiremake ipac-ng
   ipfiremake ipaddr
@@ -400,6 +413,7 @@ buildipfire() {
   ipfiremake l7-protocols
   ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
@@ -430,6 +444,11 @@ buildipfire() {
   ipfiremake Archive-Zip
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
+  ipfiremake XML-Parser
+  ipfiremake glib
+  ipfiremake dbus
+  ipfiremake hal
+  ipfiremake hwinfo
   ipfiremake GeoIP
   ipfiremake fwhits
   ipfiremake noip_updater
@@ -457,8 +476,6 @@ buildipfire() {
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
-  ipfiremake pkg-config
-  ipfiremake glib
   ipfiremake pammysql
   ipfiremake xinetd
   ipfiremake ghostscript
@@ -517,7 +534,6 @@ buildipfire() {
   ipfiremake tftp-hpa
   ipfiremake iptraf
   ipfiremake nagios
-  ipfiremake yasuc
 }
 
 buildinstaller() {
@@ -525,6 +541,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -543,10 +561,19 @@ buildinstaller() {
   installmake sysvinit
   installmake misc-progs
   installmake e2fsprogs
+  installmake libaal
+  installmake reiser4progs
   installmake reiserfsprogs
   installmake sysfsutils
   installmake util-linux
   installmake pciutils
+  installmake zlib
+  installmake wget
+  installmake libxml2
+  installmake dbus
+  installmake hal
+  installmake hwdata
+  installmake hwinfo
   installmake kudzu
   installmake installer
   installmake initrd
@@ -575,12 +602,17 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  for i in $IPFVER
-  do
-	ipfiremake cdrom ED=$i
-  done
+  if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
+		ipfiremake cdrom ED=devel
+	fi
+	ipfiremake cdrom ED=full
+	
+  # Check if there is a loop device for building in virtual environments
+  if [ -e /dev/loop0 ]; then
+  	ipfiremake usb-stick
+  fi
   ipfiremake pxe
-  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
 
@@ -603,7 +635,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {
@@ -707,7 +738,7 @@ shell)
 	;;
 changelog)
 	echo -n "Loading new Changelog from SVN: "
-	svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog
+	svn log http://svn.ipfire.org/svn/ipfire > doc/ChangeLog
 	beautify message DONE
 	;;
 clean)
@@ -881,9 +912,12 @@ svn)
 				$0 changelog
 			fi
 		fi
+		update_langs
 		svn commit
 		$0 svn up
-		$0 uploadsrc
+		if [ -n "$FTP_CACHE_URL" ]; then
+			$0 uploadsrc
+		fi
 	  ;;
 	  dist)
 		if [ $3 ]; then
@@ -894,9 +928,9 @@ svn)
 			exit 0
 		fi
 		echo -en "REV $SVN_REVISION: Downloading..."
-		svn export http://svn.ipfire.eu/svn/ipfire/trunk ipfire-source/ --force > /dev/null
-		svn log http://svn.ipfire.eu/svn/ipfire/trunk -r 1:$SVN_REVISION > ipfire-source/Changelog
-		#svn info http://svn.ipfire.eu/svn/ipfire/trunk -r $SVN_REVISION > ipfire-source/svn_status
+		svn export http://svn.ipfire.org/svn/ipfire/trunk ipfire-source/ --force > /dev/null
+		svn log http://svn.ipfire.org/svn/ipfire/trunk -r 1:$SVN_REVISION > ipfire-source/Changelog
+		#svn info http://svn.ipfire.org/svn/ipfire/trunk -r $SVN_REVISION > ipfire-source/svn_status
 		evaluate 1
 
 		echo -en "REV $SVN_REVISION: Compressing files..."
@@ -921,21 +955,19 @@ uploadsrc)
 	PWD=`pwd`
 	cd $BASEDIR/cache/
 	echo -e "Uploading cache to ftp server:"
-	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /var/tmp/ftplist
+	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /tmp/ftplist
 	for i in *; do
 		if [ "$i" == "toolchains" ]; then continue; fi
-		grep -q $i /var/tmp/ftplist
+		grep -q $i /tmp/ftplist
 		if [ "$?" -ne "0" ]; then
 			echo -ne "$i"
 			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $i
-			if [ "$?" -eq "0" ]; then
-				beautify message DONE
-			else
+			if [ "$?" -ne "0" ]; then
 				beautify message FAIL
 			fi
 		fi
 	done
-	rm -f /var/tmp/ftplist
+	rm -f /tmp/ftplist
 	cd $PWD
 	exit 0
 	;;
@@ -984,7 +1016,7 @@ EOF
 	esac
 	;;
 batch)
-	if [ "$2" -eq "--background" ]; then
+	if [ "$2" = "--background" ]; then
 		batch_script
 		exit $?
 	fi