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, next has been updated via 1854dfab2a7eae43135ccd11037e51c8585877d0 (commit) via 107d282894cbec55ed91126fc9a7314c26ff883b (commit) from 1074ce9044bd51e021a7a0ffa5c720e8d5e278c8 (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 1854dfab2a7eae43135ccd11037e51c8585877d0 Merge: 107d282 1074ce9 Author: Arne Fitzenreiter arne_f@git.ipfire.org Date: Thu Sep 8 14:34:24 2011 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 107d282894cbec55ed91126fc9a7314c26ff883b Author: Arne Fitzenreiter arne_f@git.ipfire.org Date: Thu Sep 8 14:31:56 2011 +0200

coreutils: hack uname for build on hosts with linux kernel 3.x.

-----------------------------------------------------------------------

Summary of changes: lfs/coreutils | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)

Difference in files: diff --git a/lfs/coreutils b/lfs/coreutils index 9b6ddc7..5e97941 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -105,14 +105,16 @@ ifeq "$(ROOT)" "" #ln -sf ../../bin/install /usr/bin mv -f /bin/uname /bin/uname.bak echo '#!/bin/bash' > /bin/uname - echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname + echo 'kernel=`/bin/uname.bak -r`' >> /bin/uname + echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /bin/uname chmod 755 /bin/uname dircolors -p > /etc/dircolors else rm /tools/bin/hostname mv -f /tools/bin/uname /tools/bin/uname.bak echo '#!/bin/bash' > /tools/bin/uname - echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /tools/bin/uname + echo 'kernel=`/tools/uname.bak -r`' >> /bin/uname + echo '/tools/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /bin/uname chmod 755 /tools/bin/uname endif @rm -rf $(DIR_APP)

hooks/post-receive -- IPFire 2.x development tree