Added new package: dosfstools.

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

diff --git a/make.sh b/make.sh
index 3723db90113b031dc6998fba9107f5d0839aa7c8..b1117d84b4b72e1d3fe7c7c2de070b38c6226e6a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                  # Software name
 SNAME="ipfire"                 # Short name
-VERSION="3.0-prealpha1"                # Version number
-TOOLCHAINVERSION="${VERSION}-18"       # Toolchain
+VERSION="3.0-alpha1"           # Version number
+TOOLCHAINVERSION="${VERSION}-1"        # Toolchain
 SLOGAN="Lechery"               # Software slogan
 
 # Include funtions
@@ -286,7 +286,8 @@ ipfire_build() {
        ipfire_make xfsprogs
        ipfire_make sysfsutils
        ipfire_make squashfs
-               
+       ipfire_make dosfstools
+
        ### Building hardware utils
        #
        ipfire_make pciutils
@@ -320,19 +321,11 @@ ipfire_build() {
        ipfire_make memtest86+
        #ipfire_make pakfire
        ipfire_make quagga
-
-       ipfire_make pyfire
-
-       ### -------------------------------------------------------------------------
-       ### Tools that maybe not needed
-       #
-       #ipfire_make gd
-       #ipfire_make libcap
-       #ipfire_make mtools
        #ipfire_make mISDN
-       
        #ipfire_make wireless
-       #ipfire_make libsafe
+
+       ipfire_make pyfire
+       ipfire_make firewall
 }
 
 ################################################################################
@@ -373,8 +366,6 @@ misc_build() {
        ipfire_make mkinitramfs
        ipfire_make splashy
 
-       #ipfire_make squidguard         ## CAN THIS BE BANISHED BY ANYTHING BETTER?
-       #ipfire_make calamaris          ## CAN THIS BE BANISHED BY ANYTHING BETTER?
        #ipfire_make vsftpd
 
        ## NTFS
@@ -392,9 +383,6 @@ misc_build() {
        #
        #ipfire_make snort
        #ipfire_make oinkmaster
-       #ipfire_make centerim
-       #ipfire_make tripwire
-       #ipfire_make java
        #ipfire_make cups
        #ipfire_make ghostscript
        #ipfire_make foomatic
@@ -407,33 +395,9 @@ misc_build() {
        #ipfire_make alsa
        #ipfire_make mpfire
        #ipfire_make guardian
-       #ipfire_make libid3tag
-       #ipfire_make libmad
-       #ipfire_make libogg
-       #ipfire_make libvorbis
-       #ipfire_make lame
-       #ipfire_make sox
-       #ipfire_make libshout
-       #ipfire_make icecast
-       #ipfire_make icegenerator
-       #ipfire_make mpd
-       #ipfire_make mpc
-       #ipfire_make xvid
-       #ipfire_make libmpeg2
-       #ipfire_make videolan
-       #ipfire_make libpri
-       #ipfire_make asterisk
-       #ipfire_make libsigc++
-       #ipfire_make applejuice
-       #ipfire_make libtorrent
-       #ipfire_make rtorrent
        #ipfire_make ipfireseeder
        #ipfire_make nfs
 
-       # ---------------------------------------------------------------------------
-       #ipfire_make as86
-       #ipfire_make mbr
-
        ### Debugging
        #
        ipfire_make pax-utils
@@ -482,7 +446,7 @@ packages_build() {
 
        # Generate packages list
        echo -n "Generating packages list"
-       software_list > $BASEDIR/doc/packages-list.txt
+       pkg_list_packages > $BASEDIR/doc/packages-list.txt
        beautify message DONE
 
        if [ ${EMB} -eq 0 ]; then