X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=0933e3870f993603a847805447f9dc0fbe328bab;hp=1ef357e688447eabbfe4325cfbff9ee72287abd9;hb=394864705ecd3434242be12a9190fac44188983b;hpb=bb5774c899504ecc83d84d48aa1eb493abb3e91d

diff --git a/make.sh b/make.sh
index 1ef357e688..0933e3870f 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.0a4"									# Version number
+VERSION="2.0beta1"							# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -328,26 +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
@@ -386,13 +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
@@ -402,7 +388,7 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
-  ipfiremake ibod
+  ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
   ipfiremake iptables
@@ -416,13 +402,11 @@ buildipfire() {
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake mISDN
-  ipfiremake isdn4k-utils
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
-  ipfiremake mtools
   ipfiremake nano
   ipfiremake nasm
   ipfiremake URI
@@ -457,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
@@ -479,8 +461,9 @@ buildipfire() {
   ipfiremake lzo
   ipfiremake openvpn
   ipfiremake pammysql
-  ipfiremake ghostscript
   ipfiremake cups
+  ipfiremake ghostscript
+  ipfiremake foomatic
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -507,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
@@ -602,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
@@ -637,6 +621,7 @@ buildpackages() {
 }
 
 ipfirepackages() {
+	ipfiremake core-updates
 	for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
 		[ -e $BASEDIR/lfs/$i ] && ipfiredist $i
 	done
@@ -650,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
@@ -971,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
@@ -1027,13 +1009,6 @@ pxe)
 lang)
 	update_langs
 	;;
-packages)
-	case "$2" in
-		sign)
-			sign_packages
-			;;
-	esac
-	;;
 "")
 	clear
 	svn info