X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=143f4f7f544f55dfb042e2fd47368d817274d73f;hp=9a2aaf878a0c4aba28929866f50787f89ac9a86f;hb=129cb399595b8bdac95109b343f7154bc1ba460f;hpb=330345c2824b2e0d7e63cfe952af3e4a6cc2cd3b

diff --git a/make.sh b/make.sh
index 9a2aaf878a..143f4f7f54 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 versions should be compiled? (full|light|voice|devel)
+IPFVER="full"				# Which versions should be compiled? (full|light|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -348,6 +348,7 @@ buildipfire() {
   ipfiremake zaptel
   ipfiremake fuse
   ipfiremake pkg-config
+  ipfiremake cpio
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -394,10 +395,12 @@ buildipfire() {
   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
@@ -443,9 +446,6 @@ buildipfire() {
   ipfiremake Locale-Country
   ipfiremake XML-Parser
   ipfiremake glib
-  ipfiremake dbus
-  ipfiremake hal
-  ipfiremake hwinfo
   ipfiremake GeoIP
   ipfiremake fwhits
   ipfiremake noip_updater
@@ -461,6 +461,7 @@ buildipfire() {
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
+  ipfiremake calamaris
   ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
@@ -529,8 +530,9 @@ buildipfire() {
   ipfiremake etherwake
   ipfiremake ethereal
   ipfiremake tftp-hpa
-  ipfiremake iptraf
-  ipfiremake nagios
+  ipfiremake bwm-ng
+  ipfiremake tripwire
+  ipfiremake sysstat
 }
 
 buildinstaller() {
@@ -538,6 +540,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -564,11 +568,7 @@ buildinstaller() {
   installmake pciutils
   installmake zlib
   installmake wget
-  installmake libxml2
-  installmake dbus
-  installmake hal
   installmake hwdata
-  installmake hwinfo
   installmake kudzu
   installmake installer
   installmake initrd
@@ -597,18 +597,17 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  for i in $IPFVER
-  do
-	if [ $i == "devel" ]; then
-		if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
-			ipfiremake cdrom ED=$i
-		fi
-	else
-		ipfiremake cdrom ED=$i
+  if [ "$DEVEL" == "1" ]; then
+		ipfiremake cdrom ED=devel
 	fi
-  done
+	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
 
@@ -631,7 +630,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {
@@ -683,6 +681,10 @@ case "$1" in
 build)
 	clear
 	BUILDMACHINE=`uname -m`
+	DEVEL=0
+	if [ "$2" == "--devel" ]; then
+	  DEVEL=1
+	fi
 	PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
 	#only restore on a clean disk
 	if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -909,9 +911,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
@@ -938,10 +943,12 @@ svn)
 		evaluate 1
 	  ;;
 	  diff|di)
+	  update_langs
 		echo -ne "Make a local diff to last svn revision"
 		svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
 		evaluate 1
 		echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+		svn status
 	  ;;
 	esac
 	;;
@@ -968,27 +975,32 @@ uploadsrc)
 upload)
 	case "$2" in
 	  iso)
-		echo -e "Uploading the iso to $IPFIRE_FTP_URL_EXT."
+		echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
 		cat <<EOF > .ftp-commands
-mkdir $IPFIRE_FTP_PATH_EXT
+mkdir -p $FTP_ISO_PATH/$SVN_REVISION
 ls -lah
 quit
 EOF
-		ncftp -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT < .ftp-commands
+		ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands
 		rm -f .ftp-commands
-		md5sum ipfire-install-$VERSION.i386.iso > ipfire-install-$VERSION.i386.iso.md5
-		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
+		md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso.md5
+		if [ -e ipfire-$VERSION.$MACHINE-devel.iso ]; then
+			md5sum ipfire-$VERSION.$MACHINE-devel.iso > ipfire-$VERSION.$MACHINE-devel.iso.md5
+			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso
+			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso.md5
+		fi
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-source-r$SVN_REVISION.tar.gz
+		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ 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/."
+			echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
 		else
 			echo -e "There was an error while uploading the iso to the ftp server."
 			exit 1
 		fi
 		if [ "$3" = "--with-sources-cd" ]; then
-			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/ ipfire-sources-cd-$VERSION.$MACHINE.iso
+			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
 		fi
 		;;
 	  paks)
@@ -1047,6 +1059,9 @@ pxe)
 	esac
 	exit 0
 	;;
+lang)
+	update_langs
+	;;
 "")
 	clear
 	svn info