Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

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

diff --git a/make.sh b/make.sh
index f9268c7691d150330bfb4832dd24574fe110b163..532b435bc49039475b97461721487c83ae01916b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -42,7 +42,6 @@ TOOLCHAINVER=5
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
         BUILDMACHINE="i686";
-        linux32="linux32";
     fi
 
 
@@ -214,11 +213,6 @@ prepareenv() {
     mount --bind $BASEDIR/log    $BASEDIR/build/usr/src/log
     mount --bind $BASEDIR/src    $BASEDIR/build/usr/src/src
 
-    # This is a temporary hack!!!
-    if [ ! -f /tools/bin/hostname ]; then
-      cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
-    fi
-
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
@@ -261,7 +255,6 @@ buildtoolchain() {
 
     local ORG_PATH=$PATH
     export PATH="/tools/ccache/bin:/tools/bin:$PATH"
-    lfsmake1 fake-environ              PASS=1
     lfsmake1 ccache                    PASS=1
     lfsmake1 binutils                  PASS=1
     lfsmake1 gcc                       PASS=1
@@ -270,7 +263,6 @@ buildtoolchain() {
     lfsmake1 cleanup-toolchain         PASS=1
     lfsmake1 binutils                  PASS=2
     lfsmake1 gcc                       PASS=2
-    lfsmake1 fake-environ              PASS=2
     lfsmake1 ccache                    PASS=2
     lfsmake1 tcl
     lfsmake1 expect
@@ -292,6 +284,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain         PASS=2
     export PATH=$ORG_PATH
 }
@@ -341,7 +334,6 @@ buildbase() {
     lfsmake2 iproute2
     lfsmake2 kbd
     lfsmake2 less
-    lfsmake2 libaal
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
@@ -349,7 +341,6 @@ buildbase() {
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
-    lfsmake2 reiser4progs
     lfsmake2 shadow
     lfsmake2 sysklogd
     lfsmake2 sysvinit
@@ -537,7 +528,6 @@ buildipfire() {
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipaddr
-  ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake mISDNuser
@@ -639,7 +629,6 @@ buildipfire() {
   ipfiremake cmake
   ipfiremake gnump3d
   ipfiremake libsigc++
-  ipfiremake applejuice
   ipfiremake libtorrent
   ipfiremake rtorrent
   ipfiremake ipfireseeder
@@ -1030,7 +1019,7 @@ toolchain)
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
        cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
-               build/tools log >> $LOGFILE
+               build/tools build/bin/sh log >> $LOGFILE
        md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
                > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
        stdumount