Removed an old file of libpri.

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

diff --git a/make.sh b/make.sh
index 29fa0d28f24b7f562791beaff4f4c4b461e5d062..ae8c604eca4f75c1bf57314257f7d1f3533585dc 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}-13"       # Toolchain
+TOOLCHAINVERSION="${VERSION}-18"       # Toolchain
 SLOGAN="Lechery"               # Software slogan
 
 # Include funtions
@@ -47,17 +47,21 @@ 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
-       toolchain_make linux
+       toolchain_make linux-headers
        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
 }
 
 ################################################################################
@@ -102,11 +106,12 @@ base_build() {
 
        ipfire_make stage2
        ipfire_make scripts
-       ipfire_make linux
+       ipfire_make linux-headers
        ipfire_make man-pages
        ipfire_make glibc
        ipfire_make adjust-toolchain
        ipfire_make test-toolchain
+       ipfire_make zlib
        ipfire_make binutils
        ipfire_make gcc
        ipfire_make berkeley
@@ -119,12 +124,12 @@ base_build() {
        ipfire_make ncurses
        ipfire_make procps
        ipfire_make libtool
-       ipfire_make zlib
        ipfire_make perl
        ipfire_make readline
        ipfire_make gettext
        ipfire_make make
        ipfire_make libidn
+       ipfire_make pkg-config
        ipfire_make attr
        ipfire_make libcap2
        ipfire_make paxctl
@@ -133,12 +138,14 @@ base_build() {
        ipfire_make bash
        ipfire_make bzip2
        ipfire_make diffutils
+       ipfire_make eventlog
        ipfire_make file
        ipfire_make findutils
        ipfire_make flex
        ipfire_make gmp
        ipfire_make grub
        ipfire_make gawk
+       ipfire_make glib2
        ipfire_make grep
        ipfire_make groff
        ipfire_make gzip
@@ -154,7 +161,7 @@ base_build() {
        ipfire_make patch
        ipfire_make psmisc
        ipfire_make shadow
-       ipfire_make sysklogd
+       ipfire_make syslog-ng
        ipfire_make sysvinit
        ipfire_make tar
        ipfire_make texinfo
@@ -181,30 +188,28 @@ ipfire_build() {
        ipfire_make stage3
        ipfire_make lzma
 
-       ipfire_make linux       
+       ipfire_make linux
        ipfire_make aufs
 
        ### Building some general stuff
        #   STAGE 1
-       ipfire_make pkg-config
+       ipfire_make libdaemon
        ipfire_make pcre
        ipfire_make expat
-       ipfire_make glib
        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
-       ipfire_make eventlog
-       ipfire_make syslog-ng
        ipfire_make popt
        ipfire_make libusb
+       ipfire_make libusb-compat       # Can be removed if usbutils supports libusb-1.0
        ipfire_make bc
        ipfire_make mingetty
        
@@ -227,12 +232,18 @@ 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
+       ipfire_make shadow-pam
        ipfire_make pam                                 PASS=2
        ipfire_make slang
        ipfire_make newt
@@ -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
@@ -282,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
 
@@ -303,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
        #
@@ -338,7 +351,7 @@ misc_build() {
 
        ipfire_make stage4
 
-       #ipfire_make miniupnpd
+       ipfire_make miniupnpd
 
        ### Console tools
        #
@@ -423,8 +436,11 @@ misc_build() {
 
        ### Debugging
        #
+       ipfire_make pax-utils
+       ipfire_make paxtest
        ipfire_make gdb
        ipfire_make strace
+       ipfire_make pychecker
 }
 
 ################################################################################
@@ -464,6 +480,11 @@ packages_build() {
        # Generate ChangeLog
        git_log
 
+       # Generate packages list
+       echo -n "Generating packages list"
+       software_list > $BASEDIR/doc/packages-list.txt
+       beautify message DONE
+
        if [ ${EMB} -eq 0 ]; then
                ipfire_make initramfs
                ipfire_make images