webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 20:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upnp

Browse Source
This commit is contained in:
Michael Tremer
2010-11-23 22:14:08 +01:00
parent 79df3f75fc 9457156436
commit 1d4b178db0
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
make.sh
View File

@@ -40,6 +40,13 @@ GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=3
IPFVER="full" # Which versions should be compiled? (full|devel)
BUILDMACHINE=$MACHINE
if [ "$MACHINE" = "x86_64" ]; then
BUILDMACHINE="i686";
linux32="linux32";
fi
# Debian specific settings
if [ ! -e /etc/debian_version ]; then
FULLPATH=`which $0`
@@ -227,6 +234,10 @@ prepareenv() {
}
buildtoolchain() {
if [ "$MACHINE" = "x86_64" ]; then
exiterror "Cannot build toolchain on x86_64. Please use the download."
fi
LOGFILE="$BASEDIR/log/_build.toolchain.log"
export LOGFILE
ORG_PATH=$PATH
@@ -790,7 +801,6 @@ ipfirepackages() {
case "$1" in
build)
clear
BUILDMACHINE=`uname -m`
PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
#only restore on a clean disk
if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -918,7 +928,6 @@ toolchain)
prepareenv
beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
buildtoolchain
BUILDMACHINE=`uname -m`
echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | 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-$BUILDMACHINE.tar.gz \
@@ -930,7 +939,6 @@ toolchain)
stdumount
;;
gettoolchain)
BUILDMACHINE=`uname -m`
# arbitrary name to be updated in case of new toolchain package upload
PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then

6
tools/make-functions
View File

@@ -363,7 +363,7 @@ lfsmake2() {
[ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
chroot $LFS /tools/bin/env -i HOME=/root \
$linux32 chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
VERSION=$VERSION \
@@ -394,7 +394,7 @@ ipfiremake() {
[ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
chroot $LFS /tools/bin/env -i HOME=/root \
$linux32 chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
VERSION=$VERSION \
@@ -456,7 +456,7 @@ installmake() {
[ $? == 1 ] && return 0
local PKG_TIME_START=`date +%s`
chroot $LFS /tools/bin/env -i HOME=/root \
$linux32 chroot $LFS /tools/bin/env -i HOME=/root \
TERM=$TERM PS1='\u:\w\$ ' \
PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
VERSION=$VERSION \