Swap-Abfrage gefixt.

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 6b04f4d7e3a77e7d8d4f561e731cce552b5c2f29..f784070b4983b90d572f1bd596213b451525b01d 100755 (executable)
--- 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
@@ -441,7 +441,6 @@ buildipfire() {
   ipfiremake ntp
   ipfiremake openssh
   ipfiremake openswan
-  ipfiremake pptpclient
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
@@ -493,7 +492,7 @@ buildipfire() {
   ipfiremake sox
   ipfiremake libshout
   ipfiremake icecast
-  ipfiremake ices
+  ipfiremake icegenerator
   ipfiremake mp3blaster
   ipfiremake libpri
   ipfiremake stund
@@ -589,9 +588,6 @@ 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
@@ -624,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
@@ -637,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
@@ -1015,13 +1008,6 @@ pxe)
 lang)
        update_langs
        ;;
-packages)
-       case "$2" in
-               sign)
-                       sign_packages
-                       ;;
-       esac
-       ;;
 "")
        clear
        svn info