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

diff --git a/make.sh b/make.sh
index ac3ed4b725..0933e3870f 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.0t5"									# Version number
+VERSION="2.0beta1"							# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -492,8 +492,9 @@ buildipfire() {
   ipfiremake sox
   ipfiremake libshout
   ipfiremake icecast
-  ipfiremake ices
-  ipfiremake mp3blaster
+  ipfiremake icegenerator
+  ipfiremake mpd
+  ipfiremake mpc
   ipfiremake libpri
   ipfiremake stund
   ipfiremake asterisk
@@ -588,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
@@ -623,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
@@ -636,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
@@ -1014,13 +1009,6 @@ pxe)
 lang)
 	update_langs
 	;;
-packages)
-	case "$2" in
-		sign)
-			sign_packages
-			;;
-	esac
-	;;
 "")
 	clear
 	svn info