Revert "Moved cdrtools to stage5, because they aren't needed on embedded build."

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

diff --git a/make.sh b/make.sh
index 3ef30977082578d030c7b862150621ce546d13ba..e1d19490e3f26880f7b41135445ea6a11a40bd3a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                  # Software name
 SNAME="ipfire"                 # Short name
 VERSION="3.0-prealpha"         # Version number
-TOOLCHAINVERSION="${VERSION}-5"        # Toolchain
-SLOGAN="www.ipfire.org"                # Software slogan
+TOOLCHAINVERSION="${VERSION}-6"        # Toolchain
+SLOGAN="Lechery"               # Software slogan
 
 # Include funtions
 . tools/make-include
@@ -60,9 +60,6 @@ toolchain_build() {
        toolchain_make adjust-toolchain
        toolchain_make binutils         PASS=2
        toolchain_make gcc              PASS=2
-       #toolchain_make tcl             # Maybe this can be dropped
-       #toolchain_make expect          # Maybe this can be dropped
-       #toolchain_make dejagnu         # Maybe this can be dropped
        toolchain_make ncurses
        toolchain_make bash
        toolchain_make bzip2
@@ -81,7 +78,6 @@ toolchain_build() {
        toolchain_make sed
        toolchain_make tar
        toolchain_make texinfo
-       #toolchain_make bison
        toolchain_make flex
        toolchain_make bc
        toolchain_make util-linux-ng
@@ -105,6 +101,7 @@ base_build() {
 
        ipfire_make stage2
        ipfire_make scripts
+       ipfire_make initd-tools
        ipfire_make initscripts
        ipfire_make gmp
        ipfire_make mpfr
@@ -181,8 +178,9 @@ 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
@@ -198,11 +196,11 @@ ipfire_build() {
        ipfire_make python-iconv
        ipfire_make libxml2
        ipfire_make libxslt
-       #ipfire_make libidn             ### Do we need this?
        ipfire_make pcre
        ipfire_make popt
        ipfire_make libusb
        ipfire_make bc
+       ipfire_make mingetty
        
        ### Building some network stuff
        #
@@ -236,7 +234,7 @@ ipfire_build() {
        ipfire_make curl
        ipfire_make gnupg
        ipfire_make sudo
-       #ipfire_make libjpeg
+       ipfire_make libjpeg
        ipfire_make libpng
        ipfire_make libtiff
        ipfire_make libart
@@ -264,6 +262,7 @@ ipfire_build() {
        ipfire_make reiser4progs
        ipfire_make xfsprogs
        ipfire_make sysfsutils
+       ipfire_make squashfs
                
        ### Building hardware utils
        #
@@ -288,14 +287,14 @@ ipfire_build() {
        ipfire_make noip
        ipfire_make lighttpd
        ipfire_make collectd
-       #ipfire_make logrotate
+       ipfire_make logrotate
        #ipfire_make logwatch   
        ipfire_make cpio
        ipfire_make cdrtools
        ipfire_make parted
+       ipfire_make python-parted
        ipfire_make memtest86+
        #ipfire_make pakfire
-       ipfire_make chkconfig
        
        ipfire_make pyfire
   
@@ -343,7 +342,7 @@ misc_build() {
        ipfire_make nasm
        ipfire_make syslinux
 
-       ipfire_make busybox
+       ipfire_make bootutils
        ipfire_make mkinitramfs
 
        #ipfire_make squidguard         ## CAN THIS BE BANISHED BY ANYTHING BETTER?
@@ -378,7 +377,6 @@ misc_build() {
        #ipfire_make cyrus-imapd
        #ipfire_make clamav
        #ipfire_make alsa
-       #ipfire_make mpg123
        #ipfire_make mpfire
        #ipfire_make guardian
        #ipfire_make libid3tag
@@ -418,9 +416,7 @@ misc_build() {
 ################################################################################
 installer_build() {
 
-       PATH=${TOOLS_DIR}/usr/bin:${UCLIBC_DIR}/bin:${UCLIBC_DIR}/usr/bin
-       PATH=$PATH:${UCLIBC_CC_CORE_STATIC_DIR}/bin:/bin:/usr/bin
-       PATH=$PATH:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
        STAGE_ORDER=05
        STAGE=installer
 
@@ -430,52 +426,7 @@ installer_build() {
        build_spy set stage ${STAGE} &
 
        ipfire_make stage5
-       ipfire_make ccache
-       ipfire_make gmp
-       ipfire_make mpfr
-       ipfire_make linux
-       ipfire_make binutils
-       ipfire_make uClibc              PASS=1
-       ipfire_make gcc                 PASS=1
-       ipfire_make uClibc              PASS=2
-       ipfire_make gettext             PASS=1
-       ipfire_make gcc                 PASS=2
-       ipfire_make gettext             PASS=2
-       ipfire_make udev
-       ipfire_make pciutils
-       ipfire_make zlib
-       ipfire_make ncurses
-       ipfire_make pcre
-       ipfire_make popt
-       ipfire_make glib
-       ipfire_make readline
-       ipfire_make e2fsprogs
-       #ipfire_make xfsprogs
-       ipfire_make util-linux-ng
-       ipfire_make parted
-       ipfire_make expat
-       ipfire_make dbus
-       ipfire_make dbus-glib
-       ipfire_make hal
-       ipfire_make hal-info
-       ipfire_make openssl
-       ipfire_make python
-       ipfire_make python-dbus
-       ipfire_make python-parted
-       ipfire_make python-urlgrabber
-       ipfire_make python-iconv
-       ipfire_make pam
-       ipfire_make libuser
-       ipfire_make slang
-       ipfire_make newt
-       ipfire_make bash
-       ipfire_make strace
-       ipfire_make cpio
-       ipfire_make lzma
-       ipfire_make reiserfsprogs
-       ipfire_make pyfire
        ipfire_make pomona
-       ipfire_make busybox
 }
 
 ################################################################################
@@ -509,7 +460,7 @@ packages_build() {
                        echo -n "Can't build usb-key images on this machine"
                        beautify message WARN
                fi
-               mv $LFS/$IMAGES_DIR/{*.iso,*.tar.gz,*.img.gz} $BASEDIR >$LOGFILE 2>&1
+               mv $LFS/$IMAGES_DIR/{*.iso,*.tar.gz,*.img.gz} $BASEDIR >>$LOGFILE 2>&1
        else
                if check_loop; then
                        # We put here the code that is done when