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 b01dbb44b49fa2d8876252a8f34fe757ccaa59cb..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
@@ -199,7 +196,6 @@ 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
@@ -238,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
@@ -291,7 +287,7 @@ 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
@@ -299,7 +295,6 @@ ipfire_build() {
        ipfire_make python-parted
        ipfire_make memtest86+
        #ipfire_make pakfire
-       ipfire_make chkconfig
        
        ipfire_make pyfire
   
@@ -382,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
@@ -466,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