webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

make.sh: Don't use linux32 anymore.

Browse Source
This commit is contained in:
Michael Tremer
2012-08-15 20:01:30 +02:00
parent 6e0bd65765
commit bb0ab3814f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
make.sh
View File

@@ -42,7 +42,6 @@ TOOLCHAINVER=5
BUILDMACHINE=$MACHINE BUILDMACHINE=$MACHINE
if [ "$MACHINE" = "x86_64" ]; then if [ "$MACHINE" = "x86_64" ]; then
BUILDMACHINE="i686"; BUILDMACHINE="i686";
linux32="linux32";
fi fi

8
tools/make-functions
View File

@@ -293,7 +293,7 @@ entershell() {
fi fi
echo "Entering to a shell inside LFS chroot, go out with exit" 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 \ PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \ VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
@@ -411,7 +411,7 @@ lfsmake2() {
[ $? == 1 ] && return 0 [ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s` 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\$ ' \ TERM=$TERM PS1='\u:\w\$ ' \
PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
VERSION=$VERSION \ VERSION=$VERSION \
@@ -446,7 +446,7 @@ ipfiremake() {
[ $? == 1 ] && return 0 [ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s` 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\$ ' \ TERM=$TERM PS1='\u:\w\$ ' \
PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \ PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
VERSION=$VERSION \ VERSION=$VERSION \
@@ -517,7 +517,7 @@ installmake() {
[ $? == 1 ] && return 0 [ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s` 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\$ ' \ TERM=$TERM PS1='\u:\w\$ ' \
PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \ PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
VERSION=$VERSION \ VERSION=$VERSION \