Added new package: dosfstools.

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

diff --git a/make.sh b/make.sh
index a25e8e18abbd77c2b37c5f470ecfffa90ca41b76..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}-15"       # Toolchain
+VERSION="3.0-alpha1"           # Version number
+TOOLCHAINVERSION="${VERSION}-1"        # Toolchain
 SLOGAN="Lechery"               # Software slogan
 
 # Include funtions
@@ -47,10 +47,13 @@ toolchain_build() {
 
        build_spy stage ${STAGE}
 
+       # We can't skip packages in toolchain stage
+       SAVE_SKIP_PACKAGE_LIST=$SKIP_PACKAGE_LIST
+       SKIP_PACKAGE_LIST=
+
        toolchain_make stage1
-       #toolchain_make scripts
        # make distcc first so that CCACHE_PREFIX works immediately
-       [ -z "$DISTCC_HOSTS" ] || toolchain_make distcc
+       toolchain_make distcc
        toolchain_make ccache
        toolchain_make binutils         PASS=1
        toolchain_make gcc              PASS=1
@@ -58,6 +61,7 @@ toolchain_build() {
        toolchain_make glibc
        toolchain_make adjust-toolchain
        toolchain_make test-toolchain   PASS=1
+       toolchain_make zlib
        toolchain_make gcc              PASS=2
        toolchain_make binutils         PASS=2
        toolchain_make test-toolchain   PASS=2
@@ -83,7 +87,7 @@ toolchain_build() {
        toolchain_make bc
        toolchain_make util-linux-ng
        toolchain_make strip
-       export PATH=$ORG_PATH
+       export PATH=$ORG_PATH SKIP_PACKAGE_LIST=$SAVE_SKIP_PACKAGE_LIST
 }
 
 ################################################################################
@@ -107,6 +111,7 @@ base_build() {
        ipfire_make glibc
        ipfire_make adjust-toolchain
        ipfire_make test-toolchain
+       ipfire_make zlib
        ipfire_make binutils
        ipfire_make gcc
        ipfire_make berkeley
@@ -119,7 +124,6 @@ base_build() {
        ipfire_make ncurses
        ipfire_make procps
        ipfire_make libtool
-       ipfire_make zlib
        ipfire_make perl
        ipfire_make readline
        ipfire_make gettext
@@ -141,7 +145,7 @@ base_build() {
        ipfire_make gmp
        ipfire_make grub
        ipfire_make gawk
-       ipfire_make glib
+       ipfire_make glib2
        ipfire_make grep
        ipfire_make groff
        ipfire_make gzip
@@ -189,16 +193,17 @@ ipfire_build() {
 
        ### Building some general stuff
        #   STAGE 1
+       ipfire_make libdaemon
        ipfire_make pcre
        ipfire_make expat
        ipfire_make dbus
        ipfire_make dbus-glib
        ipfire_make openssl
-       ipfire_make perl                        ### We are building the modules here.
+       ipfire_make perl-xml-parser
+       ipfire_make intltool
        ipfire_make python
        ipfire_make python-dbus
        ipfire_make python-urlgrabber
-       ipfire_make python-iconv
        ipfire_make python-IPy
        ipfire_make libxml2
        ipfire_make libxslt
@@ -227,9 +232,15 @@ ipfire_build() {
        ipfire_make vlan
        ipfire_make bind
        ipfire_make whois
+       ipfire_make avahi
        
        ### Building some general stuff
        #   STAGE 2
+       ipfire_make pth
+       ipfire_make libassuan
+       ipfire_make libgpg-error
+       ipfire_make libgcrypt
+       ipfire_make libksba
        ipfire_make cracklib
        ipfire_make pam                                 PASS=1
        ipfire_make shadow-pam
@@ -242,7 +253,8 @@ ipfire_build() {
        ipfire_make nss_ldap
        ipfire_make sqlite
        ipfire_make curl
-       ipfire_make gnupg
+       ipfire_make pinentry
+       ipfire_make gnupg2
        ipfire_make sudo
        ipfire_make libjpeg
        ipfire_make libpng
@@ -274,7 +286,8 @@ ipfire_build() {
        ipfire_make xfsprogs
        ipfire_make sysfsutils
        ipfire_make squashfs
-               
+       ipfire_make dosfstools
+
        ### Building hardware utils
        #
        ipfire_make pciutils
@@ -282,6 +295,7 @@ ipfire_build() {
        ipfire_make hdparm
        ipfire_make smartmontools
        ipfire_make lm-sensors
+       ipfire_make parted
        ipfire_make hal
        ipfire_make hal-info
 
@@ -303,23 +317,15 @@ ipfire_build() {
        #ipfire_make logwatch   
        ipfire_make cpio
        ipfire_make cdrtools
-       ipfire_make parted
        ipfire_make python-parted
        ipfire_make memtest86+
        #ipfire_make pakfire
-       
-       ipfire_make pyfire
-  
-       ### -------------------------------------------------------------------------
-       ### Tools that maybe not needed
-       #
-       #ipfire_make gd
-       #ipfire_make libcap
-       #ipfire_make mtools
+       ipfire_make quagga
        #ipfire_make mISDN
-       
        #ipfire_make wireless
-       #ipfire_make libsafe
+
+       ipfire_make pyfire
+       ipfire_make firewall
 }
 
 ################################################################################
@@ -346,7 +352,7 @@ misc_build() {
        #ipfire_make traceroute
        #ipfire_make nmap
        #ipfire_make rsync
-       #ipfire_make tcpdump
+       ipfire_make tcpdump
        ipfire_make htop
        ipfire_make nano
        ipfire_make squid
@@ -360,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
@@ -379,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
@@ -394,37 +395,16 @@ 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
+       ipfire_make paxtest
        ipfire_make gdb
        ipfire_make strace
+       ipfire_make pychecker
 }
 
 ################################################################################
@@ -466,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