X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcoreutils;h=d0f35c205a080e9dfbdcd3f0db00479d6f3fcf99;hp=5e97941d2e0f3f416e0fb388548acf629f671d2f;hb=6f49e32b74ba5312385238e6b59bbe2f52ea2e5a;hpb=107d282894cbec55ed91126fc9a7314c26ff883b

diff --git a/lfs/coreutils b/lfs/coreutils
index 5e97941d2..d0f35c205 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -40,11 +40,13 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls --host=$(MACHINE)
+  EXTRA_CONFIG = --prefix=/tools --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 
+EXTRA_CONFIG += ac_cv_func_working_mktime=yes
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -83,8 +85,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-rename-tee.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-futimes.patch
 ifeq "$(ROOT)" ""
+ifeq "$(MACHINE)" "i586"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch
+endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-suppress_uptime_kill_su-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-i18n-1.patch
 	cd $(DIR_APP) && chmod +x tests/sort/sort-mb-tests
@@ -103,19 +109,9 @@ ifeq "$(ROOT)" ""
 	mv -v /usr/bin/{head,sleep,nice} /bin
 	ln -sf test /bin/[
 	#ln -sf ../../bin/install /usr/bin
-	mv -f /bin/uname /bin/uname.bak
-	echo '#!/bin/bash'				>  /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
+	dircolors -p > /etc/DIR_COLORS
 else
 	rm /tools/bin/hostname
-	mv -f /tools/bin/uname /tools/bin/uname.bak
-	echo '#!/bin/bash'					>  /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)
 	@$(POSTBUILD)