X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=0933e3870f993603a847805447f9dc0fbe328bab;hp=03faf906422f42c6219c5f86a53355ff281680e9;hb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d;hpb=a7ec54078af34b2e91c3f3c3326924efc191fb76

diff --git a/make.sh b/make.sh
index 03faf90642..0933e3870f 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.0t4"									# Version number
+VERSION="2.0beta1"							# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -82,11 +82,11 @@ prepareenv() {
     #                                                                          #
     ############################################################################
     if [ ! "$BASH" ]; then
-	exiterror "BASH environment variable is not set.  You're probably running the wrong shell."
+			exiterror "BASH environment variable is not set.  You're probably running the wrong shell."
     fi
 
     if [ -z "${BASH_VERSION}" ]; then
-	exiterror "Not running BASH shell."
+			exiterror "Not running BASH shell."
     fi
 
 
@@ -106,10 +106,10 @@ prepareenv() {
     echo -ne "Resetting our nice level to $NICE" | tee -a $LOGFILE
     renice $NICE $$ > /dev/null
     if [ `nice` != "$NICE" ]; then
-	beautify message FAIL
-	exiterror "Failed to set correct nice level"
+			beautify message FAIL
+			exiterror "Failed to set correct nice level"
     else
-	beautify message DONE
+			beautify message DONE
     fi
 
 
@@ -120,10 +120,10 @@ prepareenv() {
     ############################################################################
     echo -ne "Checking if we're running as root user" | tee -a $LOGFILE
     if [ `id -u` != 0 ]; then
-	beautify message FAIL
-	exiterror "Not building as root"
+			beautify message FAIL
+			exiterror "Not building as root"
     else
-	beautify message DONE
+			beautify message DONE
     fi
 
 
@@ -136,13 +136,13 @@ prepareenv() {
     BASE_DEV=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'`
     BASE_ASPACE=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'`
     if (( 2048000 > $BASE_ASPACE )); then
-	BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
-	if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
-		beautify message FAIL
-		exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
-	fi
+			BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
+			if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
+				beautify message FAIL
+				exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
+			fi
     else
-	beautify message DONE
+			beautify message DONE
     fi
 
     ############################################################################
@@ -161,10 +161,10 @@ prepareenv() {
         rm -f /tools
     fi
     if [ ! -a /tools ]; then
-	ln -s $BASEDIR/build/tools /
+			ln -s $BASEDIR/build/tools /
     fi
     if [ ! -h /tools ]; then
-	exiterror "Could not create /tools symbolic link."
+			exiterror "Could not create /tools symbolic link."
     fi
 
     # Setup environment
@@ -328,24 +328,12 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake linux			SMP=1
   ipfiremake ipp2p			SMP=1
-  ipfiremake fcdsl			SMP=1
-  ipfiremake fcdsl2			SMP=1
-  ipfiremake fcdslsl		SMP=1
-  ipfiremake fcdslusb		SMP=1
-  ipfiremake fcdslslusb	SMP=1
-#  ipfiremake promise-sata-300-tx	SMP=1
+  ipfiremake r8169			SMP=1
   ipfiremake zaptel			SMP=1
-  ipfiremake fuse				SMP=1
   ipfiremake linux
   ipfiremake ipp2p
-  ipfiremake fcdsl
-  ipfiremake fcdsl2
-  ipfiremake fcdslsl
-  ipfiremake fcdslusb
-  ipfiremake fcdslslusb
-#  ipfiremake promise-sata-300-tx
+  ipfiremake r8169
   ipfiremake zaptel
-  ipfiremake fuse
   ipfiremake pkg-config
   ipfiremake cpio
   ipfiremake klibc
@@ -384,12 +372,13 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake bind
-  ipfiremake capi4k-utils
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
+  ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake sysfsutils
+  ipfiremake fuse
   ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
@@ -399,7 +388,7 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
-  ipfiremake ibod
+  ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
   ipfiremake iptables
@@ -412,14 +401,12 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-  ipfiremake isdn4k-utils
   ipfiremake mISDN
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
-  ipfiremake mtools
   ipfiremake nano
   ipfiremake nasm
   ipfiremake URI
@@ -454,12 +441,10 @@ buildipfire() {
   ipfiremake ntp
   ipfiremake openssh
   ipfiremake openswan
-  ipfiremake pptpclient
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
   ipfiremake snort
-  ipfiremake snortsnarf
   ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph
@@ -476,8 +461,9 @@ buildipfire() {
   ipfiremake lzo
   ipfiremake openvpn
   ipfiremake pammysql
-  ipfiremake ghostscript
   ipfiremake cups
+  ipfiremake ghostscript
+  ipfiremake foomatic
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -504,7 +490,11 @@ buildipfire() {
   ipfiremake libvorbis
   ipfiremake lame
   ipfiremake sox
-  ipfiremake mp3blaster
+  ipfiremake libshout
+  ipfiremake icecast
+  ipfiremake icegenerator
+  ipfiremake mpd
+  ipfiremake mpc
   ipfiremake libpri
   ipfiremake stund
   ipfiremake asterisk
@@ -599,13 +589,10 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  if [ "$DEVEL" == "1" ]; 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
+  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
   	ipfiremake usb-stick
   fi
   ipfiremake pxe
@@ -634,38 +621,10 @@ buildpackages() {
 }
 
 ipfirepackages() {
-  ipfiredist alsa
-#  ipfiredist amavisd
-  ipfiredist applejuice
-#  ipfiredist asterisk
-  ipfiredist clamav
-  ipfiredist cups
-  ipfiredist cyrus-sasl
-  ipfiredist ethereal
-#  ipfiredist fetchmail
-#  ipfiredist gnump3d
-  ipfiredist guardian
-  ipfiredist ipfireseeder
-  ipfiredist java
-  ipfiredist libogg
-  ipfiredist libvorbis
-  ipfiredist mailx
-#  ipfiredist mldonkey
-  ipfiredist mp3blaster
-  ipfiredist mpfire
-  ipfiredist mpg123
-#  ipfiredist nfs
-  ipfiredist nmap
-  ipfiredist openldap
-#  ipfiredist postfix
-  ipfiredist rsync
-  ipfiredist rtorrent
-  ipfiredist samba
-  ipfiredist sox
-#  ipfiredist spamassassin
-  ipfiredist tripwire
-  ipfiredist vsftpd
-#  ipfiredist webcyradm
+	ipfiremake core-updates
+	for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
+		[ -e $BASEDIR/lfs/$i ] && ipfiredist $i
+	done
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
@@ -676,10 +635,6 @@ 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
@@ -997,6 +952,7 @@ EOF
 					fi
 				fi
 		done
+		rm -f ipfire-$VERSION.$MACHINE-full.iso.md5
 		if [ "$3" = "--with-sources-cd" ]; then
 			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
 		fi
@@ -1053,13 +1009,6 @@ pxe)
 lang)
 	update_langs
 	;;
-packages)
-	case "$2" in
-		sign)
-			sign_packages
-			;;
-	esac
-	;;
 "")
 	clear
 	svn info