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 1580da9432e14c1f11c922714585d8fd8a77c0bf..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
@@ -101,6 +101,7 @@ base_build() {
 
        ipfire_make stage2
        ipfire_make scripts
+       ipfire_make initd-tools
        ipfire_make initscripts
        ipfire_make gmp
        ipfire_make mpfr
@@ -193,10 +194,8 @@ ipfire_build() {
        ipfire_make python-dbus
        ipfire_make python-urlgrabber
        ipfire_make python-iconv
-       ipfire_make python-parted
        ipfire_make libxml2
        ipfire_make libxslt
-       #ipfire_make libidn             ### Do we need this?
        ipfire_make pcre
        ipfire_make popt
        ipfire_make libusb
@@ -235,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
@@ -288,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
@@ -296,7 +295,6 @@ ipfire_build() {
        ipfire_make python-parted
        ipfire_make memtest86+
        #ipfire_make pakfire
-       ipfire_make chkconfig
        
        ipfire_make pyfire