This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 94571564362b2583f2aed6a4f49c577774fe7928 (commit) from 3a3940b78e535ec0acc2d0308f8caf1e27234430 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 94571564362b2583f2aed6a4f49c577774fe7928 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 10 22:00:05 2010 +0100
Enabled build on x86_64 machines.
-----------------------------------------------------------------------
Summary of changes: make.sh | 14 +++++++++++--- tools/make-functions | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-)
Difference in files: diff --git a/make.sh b/make.sh index 331479d..fc3d938 100755 --- a/make.sh +++ b/make.sh @@ -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 @@ -789,7 +800,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 @@ -917,7 +927,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 \ @@ -929,7 +938,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 diff --git a/tools/make-functions b/tools/make-functions index 4bf4140..530cd47 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -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 \
hooks/post-receive -- IPFire 2.x development tree