make.sh: Don't use linux32 anymore.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 18:01:30 +0000 (20:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 18:01:30 +0000 (20:01 +0200)
make.sh
tools/make-functions

diff --git a/make.sh b/make.sh
index c62e748..d1978cc 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
 
 
index f501767..a9f8136 100644 (file)
@@ -293,7 +293,7 @@ entershell() {
        fi
 
        echo "Entering to a shell inside LFS chroot, go out with exit"
-       $linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+       chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
                PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
                VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
@@ -411,7 +411,7 @@ lfsmake2() {
        [ $? == 1 ] && return 0
 
        local PKG_TIME_START=`date +%s`
-       $linux32 chroot $LFS /tools/bin/env -i  HOME=/root \
+       chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
                                                VERSION=$VERSION \
@@ -446,7 +446,7 @@ ipfiremake() {
        [ $? == 1 ] && return 0
 
        local PKG_TIME_START=`date +%s`
-       $linux32 chroot $LFS /tools/bin/env -i  HOME=/root \
+       chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \
@@ -517,7 +517,7 @@ installmake() {
        [ $? == 1 ] && return 0
 
        local PKG_TIME_START=`date +%s`
-       $linux32 chroot $LFS /tools/bin/env -i  HOME=/root \
+       chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \