X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=8b586376543e533f398b5734a1e2cb1eb3ebfb86;hb=eedc26d9513bfccac956100cb32f81424e7b85fb;hp=1edaed64453b0ac141758cef40383761b8bc4dcb;hpb=ca19afeb816f42c7c207040dab790fccd65586f0;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 1edaed6445..8b58637654 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
@@ -330,12 +330,10 @@ buildipfire() {
   ipfiremake ipp2p			SMP=1
   ipfiremake r8169			SMP=1
   ipfiremake zaptel			SMP=1
-  ipfiremake fuse				SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake r8169
   ipfiremake zaptel
-  ipfiremake fuse
   ipfiremake pkg-config
   ipfiremake cpio
   ipfiremake klibc
@@ -380,6 +378,7 @@ buildipfire() {
   ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake sysfsutils
+  ipfiremake fuse
   ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
@@ -442,7 +441,6 @@ buildipfire() {
   ipfiremake ntp
   ipfiremake openssh
   ipfiremake openswan
-  ipfiremake pptpclient
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
@@ -494,7 +492,7 @@ buildipfire() {
   ipfiremake sox
   ipfiremake libshout
   ipfiremake icecast
-  ipfiremake ices
+  ipfiremake icegenerator
   ipfiremake mp3blaster
   ipfiremake libpri
   ipfiremake stund
@@ -590,13 +588,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
@@ -625,6 +620,7 @@ buildpackages() {
 }
 
 ipfirepackages() {
+	ipfiremake core-updates
 	for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
 		[ -e $BASEDIR/lfs/$i ] && ipfiredist $i
 	done
@@ -638,10 +634,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
@@ -1016,13 +1008,6 @@ pxe)
 lang)
 	update_langs
 	;;
-packages)
-	case "$2" in
-		sign)
-			sign_packages
-			;;
-	esac
-	;;
 "")
 	clear
 	svn info