Add better uname replacement.

[people/teissler/ipfire-2.x.git] / lfs / coreutils

diff --git a/lfs/coreutils b/lfs/coreutils
index 4f3d56e922722221615b61f9eeaded8c607d11ee..c4aa9db02b1cdef45d6353455d0ab9e205f154f4 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -40,7 +40,7 @@ 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
@@ -85,7 +85,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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
 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
@@ -105,15 +107,13 @@ ifeq "$(ROOT)" ""
        ln -sf test /bin/[
        #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
+       cp -vf $(DIR_SRC)/src/scripts/uname /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
+       cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname
        chmod 755 /tools/bin/uname
 endif
        @rm -rf $(DIR_APP)