QoS-Graphen wieder eingebaut.

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

diff --git a/make.sh b/make.sh
index c9132d279d9894ad985c1c9ae2bb3fb7480d080d..e73e67647989f3601bad5f64ce705501106eb09e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,14 +17,14 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2006 IPFire-Team <info@ipfire.eu>.                         #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                         #
 #                                                                          #
 ############################################################################
 #
 
 NAME="IPFire"                          # Software name
 SNAME="ipfire"                 # Short name
-VERSION="2.0a3"                        # Version number
+VERSION="2.0t4"                        # Version number
 SLOGAN="www.ipfire.org"                # Software slogan
 CONFIG_ROOT=/var/ipfire                # Configuration rootdir
 NICE=10                                # Nice level
@@ -333,11 +333,10 @@ buildipfire() {
   ipfiremake fcdslsl           SMP=1
   ipfiremake fcdslusb          SMP=1
   ipfiremake fcdslslusb        SMP=1
-  ipfiremake fcpci                     SMP=1
 #  ipfiremake promise-sata-300-tx      SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake fuse                              SMP=1
-  ipfiremake linux                     XEN=1
+  #ipfiremake linux                    XEN=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake fcdsl
@@ -345,7 +344,6 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-  ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse
@@ -359,12 +357,14 @@ buildipfire() {
   ipfiremake gmp
   ipfiremake pam
   ipfiremake openssl
+  ipfiremake curl
   ipfiremake python
   ipfiremake libnet
   ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
+  ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
@@ -372,7 +372,9 @@ buildipfire() {
   ipfiremake newt
   ipfiremake libcap
   ipfiremake pciutils
+  ipfiremake usbutils
   ipfiremake libxml2
+  ipfiremake libxslt
   ipfiremake BerkeleyDB
   ipfiremake mysql
   ipfiremake cyrus-sasl
@@ -412,7 +414,8 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-#  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake isdn4k-utils
+  ipfiremake mISDN
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
@@ -420,7 +423,6 @@ buildipfire() {
   ipfiremake misc-progs
   ipfiremake mtools
   ipfiremake nano
-  ipfiremake nash
   ipfiremake nasm
   ipfiremake URI
   ipfiremake HTML-Tagset
@@ -445,6 +447,8 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
+  ipfiremake MP3-Info
+  ipfiremake MP3-Tag
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -505,9 +509,13 @@ buildipfire() {
   ipfiremake lame
   ipfiremake sox
   ipfiremake gnump3d
+  ipfiremake libsigc++
+  ipfiremake ctorrent
   ipfiremake applejuice
   ipfiremake ocaml
   ipfiremake mldonkey
+  ipfiremake libtorrent
+  ipfiremake rtorrent
   ipfiremake rsync
   ipfiremake tcpwrapper
   ipfiremake portmap
@@ -524,6 +532,9 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
+  ipfiremake alsa
+  ipfiremake mp3blaster
+  ipfiremake which
 }
 
 buildinstaller() {
@@ -624,17 +635,21 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  ipfiredist alsa
 #  ipfiredist amavisd
-#  ipfiredist applejuice
+  ipfiredist applejuice
 #  ipfiredist asterisk
   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrus-sasl
 #  ipfiredist fetchmail
 #  ipfiredist gnump3d
-#  ipfiredist java
+  ipfiredist java
+  ipfiredist libogg
+  ipfiredist libvorbis
 #  ipfiredist mailx
 #  ipfiredist mldonkey
+  ipfiredist mp3blaster
   ipfiredist mpg123
 #  ipfiredist nfs
   ipfiredist openldap
@@ -951,7 +966,7 @@ upload)
          iso)
                echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
                cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION
+mkdir -p $FTP_ISO_PATH$SVN_REVISION
 ls -lah
 quit
 EOF
@@ -979,7 +994,7 @@ EOF
                ;;
          paks)
                cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION/paks
+mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
 ls -lah
 quit
 EOF