X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=63ffa6edb9158032d96f6cb88763670495ecad75;hp=b6e472074752caa9f3cb68ba0a81a0e245d2d080;hb=d02350a277a2087f3f774400d1c380510bfbfba9;hpb=05207d6927b62a9e4f63b3560719a5bd4cca0e81

diff --git a/make.sh b/make.sh
index b6e4720747..63ffa6edb9 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"				# Which version should be compiled? (full|light|voice)
+IPFVER="full devel"				# Which versions should be compiled? (full|light|voice|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -332,7 +332,8 @@ buildipfire() {
   ipfiremake fcdslslusb		SMP=1
   ipfiremake fcpci			SMP=1
 #  ipfiremake promise-sata-300-tx	SMP=1
-  ipfiremake zaptel			PASS=S
+  ipfiremake zaptel			SMP=1
+  ipfiremake fuse			SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake fcdsl
@@ -343,6 +344,7 @@ buildipfire() {
   ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
+  ipfiremake fuse
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -371,7 +373,6 @@ buildipfire() {
   ipfiremake openldap
   ipfiremake apache2
   ipfiremake php
-  ipfiremake subversion
   ipfiremake apache2			PASS=C
   ipfiremake arping
   ipfiremake beep
@@ -381,6 +382,8 @@ buildipfire() {
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
+  ipfiremake squashfstools
+  ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
@@ -390,7 +393,10 @@ buildipfire() {
   ipfiremake ibod
   ipfiremake initscripts
   ipfiremake iptables
+  ipfiremake libupnp
   ipfiremake ipp2p			IPT=1
+  ipfiremake moblock
+  ipfiremake linux-igd
   ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -401,7 +407,6 @@ buildipfire() {
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
-  ipfiremake mingetty
   ipfiremake misc-progs
   ipfiremake mtools
   ipfiremake nano
@@ -444,14 +449,13 @@ buildipfire() {
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
-#  ipfiremake tcpdump
+  ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
   ipfiremake wireless
   ipfiremake libsafe
   ipfiremake 3c5x9setup
   ipfiremake pakfire
-  ipfiremake startscripts
   ipfiremake java
   ipfiremake bootsplash
   ipfiremake spandsp
@@ -548,7 +552,6 @@ buildinstaller() {
   installmake util-linux
   installmake pciutils
   installmake kudzu
-#  installmake bootsplash
   installmake installer
   installmake initrd
 }
@@ -576,7 +579,16 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  ipfiremake cdrom
+  for i in $IPFVER
+  do
+	if [ $i == "devel" ]; then
+		if [ ! -f ipfire-$VER.i586-devel.iso ]; then
+			ipfiremake cdrom ED=$i
+		fi
+	else
+		ipfiremake cdrom ED=$i
+	fi
+  done
   ipfiremake pxe
   cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
@@ -677,13 +689,11 @@ build)
 	fi
 
 	beautify build_start
-	beautify build_stage_start "Building base"
+	beautify build_stage "Building LFS"
 	buildbase
-	beautify build_stage_end
 
-	beautify build_stage_start "Building IPFire"
+	beautify build_stage "Building IPFire"
 	buildipfire
-	beautify build_stage_end
 
 	# Setzen des IPFire Builds
 	if [ "$FIREBUILD" ]; then
@@ -692,13 +702,11 @@ build)
 		echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
 	fi
 
-	beautify build_stage_start "Building installer"
+	beautify build_stage "Building installer"
 	buildinstaller
-	beautify build_stage_end
 
-	beautify build_stage_start "Building packages"
+	beautify build_stage "Building packages"
 	buildpackages
-	beautify build_stage_end
 	beautify build_end
 	;;
 shell)
@@ -709,7 +717,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)
@@ -896,9 +904,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..."
@@ -923,30 +931,19 @@ uploadsrc)
 	PWD=`pwd`
 	cd $BASEDIR/cache/
 	echo -e "Uploading cache to ftp server:"
-	ncftpls -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT ftp://$IPFIRE_FTP_URL_INT$IPFIRE_FTP_PATH_INT/ > /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 -bb -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT $IPFIRE_FTP_URL_INT $IPFIRE_FTP_PATH_INT/ $i >> $BASEDIR/log/_build.uploadsrc.log 2>&1
-			if [ "$?" -eq "0" ]; then
-				beautify message DONE
-			else
+			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $i
+			if [ "$?" -ne "0" ]; then
 				beautify message FAIL
 			fi
 		fi
 	done
-	rm -f /var/tmp/ftplist
-	UL_TIME_START=`date +'%s'`
-	ncftpbatch -d > /dev/null 2>&1
-	while ps acx | grep -q ncftpbatch
-	do
-		UL_TIME=$(expr `date +'%s'` - $UL_TIME_START)
-		echo -ne "\r ${UL_TIME}s : Upload is running..."
-		sleep 1
-	done
-	beautify message DONE
+	rm -f /tmp/ftplist
 	cd $PWD
 	exit 0
 	;;
@@ -962,10 +959,10 @@ EOF
 		ncftp -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT < .ftp-commands
 		rm -f .ftp-commands
 		md5sum ipfire-install-$VERSION.i386.iso > ipfire-install-$VERSION.i386.iso.md5
-		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso
-		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso.md5
-		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-r$SVN_REVISION.tar.gz
-		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ svn_status
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-install-$VERSION.i386.iso
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-install-$VERSION.i386.iso.md5
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-source-r$SVN_REVISION.tar.gz
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ svn_status
 		if [ "$?" -eq "0" ]; then
 			echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/."
 		else
@@ -973,7 +970,7 @@ EOF
 			exit 1
 		fi
 		if [ "$3" = "--with-sources-cd" ]; then
-			ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-sources-cd-$VERSION.$MACHINE.iso
+			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-sources-cd-$VERSION.$MACHINE.iso
 		fi
 		;;
 	  paks)