Merge branch 'ssp'

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

diff --git a/make.sh b/make.sh
index 8eabb6a0d126a4546d6e7944890816369b7de5a6..a62728442e622b6afb30a80193cab064983f821e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -22,11 +22,11 @@
 ############################################################################
 #
 
-NAME="IPFire"                                                                          # Software name
-SNAME="ipfire"                                                                 # Short name
-VERSION="3.0-prealpha"                                 # Version number
+NAME="IPFire"                  # Software name
+SNAME="ipfire"                 # Short name
+VERSION="3.0-prealpha"         # Version number
 TOOLCHAINVERSION="${VERSION}-4"        # Toolchain
-SLOGAN="www.ipfire.org"                                        # Software slogan
+SLOGAN="www.ipfire.org"                # Software slogan
 
 # Include funtions
 . tools/make-include
@@ -208,9 +208,9 @@ ipfire_build() {
        
        ### Building some general stuff
        #   STAGE 2
-       ipfire_make pam                                                                                                                                                 PASS=1
+       ipfire_make pam                                 PASS=1
        ipfire_make shadow
-       ipfire_make pam                                                                                                                                                 PASS=2
+       ipfire_make pam                                 PASS=2
        ipfire_make slang
        ipfire_make newt
        ipfire_make cyrus-sasl
@@ -393,17 +393,45 @@ misc_build() {
 ################################################################################
 installer_build() {
 
-       PATH=${TOOLS_DIR}/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/${MACHINE_REAL}-linux/bin
+       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
        STAGE_ORDER=05
        STAGE=installer
 
        LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-installer.log"
        export LOGFILE
-       
+
        ipfire_make stage5
+       ipfire_make ccache
+       ipfire_make linux
+       ipfire_make binutils
+       ipfire_make uClibc              PASS=1
+       ipfire_make gcc                 PASS=1
+       ipfire_make uClibc              PASS=2
+       ipfire_make gcc                 PASS=2
+       ipfire_make gettext
+       ipfire_make udev
+       ipfire_make pciutils
+       ipfire_make zlib
+       ipfire_make ncurses
+       ipfire_make pcre
+       ipfire_make popt
+       #ipfire_make readline
+       ipfire_make e2fsprogs
+       ipfire_make util-linux-ng
+       ipfire_make parted
+       ipfire_make python
+       ipfire_make kudzu
+       ipfire_make slang
+       ipfire_make newt
+       #ipfire_make bash
+       ipfire_make strace
+       ipfire_make cpio
+       ipfire_make lzma
+       ipfire_make pyfire
+       ipfire_make pomona
        ipfire_make busybox
-       ipfire_make installer
-       ipfire_make initramfs
 }
 
 ################################################################################
@@ -418,18 +446,22 @@ packages_build() {
        LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-packages.log"
        export LOGFILE
 
-  toolchain_make strip
-  
-  # Generating list of packages used
-       ### MISSING ATM
+       toolchain_make strip
+       ipfire_make initramfs
+
+       # Generate ChangeLog
+       . $BASEDIR/tools/make-git
+       git_log
+
+       # Generating list of packages used
 
        ipfire_make cdrom
        
-  # Check if there is a loop device for building in virtual environments
-  #if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-  #    ipfire_make usb-stick
-  #fi
-  mv $LFS/$IMAGES_DIR/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
+       # Check if there is a loop device for building in virtual environments
+       #if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+       #       ipfire_make usb-stick
+       #fi
+       mv $LFS/$IMAGES_DIR/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
        #ipfire_make core-updates
        ### DISABLED ATM
@@ -444,11 +476,11 @@ packages_build() {
                fi
        done
 
-  # Cleanup
-  stdumount
-  rm -rf $LFS/tmp/*
-
-  cd $PWD
+       # Cleanup
+       stdumount
+       rm -rf $LFS/tmp/*
+       
+       cd $PWD
 }
 
 # See what we're supposed to do