Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

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

diff --git a/make.sh b/make.sh
index 25585ff3545e9300c032031318682ded8f49f51b..3723db90113b031dc6998fba9107f5d0839aa7c8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                  # Software name
 SNAME="ipfire"                 # Short name
 VERSION="3.0-prealpha1"                # Version number
-TOOLCHAINVERSION="${VERSION}-16"       # Toolchain
+TOOLCHAINVERSION="${VERSION}-18"       # Toolchain
 SLOGAN="Lechery"               # Software slogan
 
 # Include funtions
@@ -52,9 +52,8 @@ toolchain_build() {
        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
@@ -146,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
@@ -194,12 +193,14 @@ 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
@@ -231,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
@@ -246,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
@@ -286,6 +294,7 @@ ipfire_build() {
        ipfire_make hdparm
        ipfire_make smartmontools
        ipfire_make lm-sensors
+       ipfire_make parted
        ipfire_make hal
        ipfire_make hal-info
 
@@ -307,13 +316,13 @@ 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 quagga
+
        ipfire_make pyfire
-  
+
        ### -------------------------------------------------------------------------
        ### Tools that maybe not needed
        #
@@ -350,7 +359,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
@@ -427,6 +436,8 @@ misc_build() {
 
        ### Debugging
        #
+       ipfire_make pax-utils
+       ipfire_make paxtest
        ipfire_make gdb
        ipfire_make strace
        ipfire_make pychecker