toolchain: remove old uname hack.

diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils
index 22094c7e2ab34c070c0927a29afb403c5f825074..3901b697eb5d90ca81ea04cb3155be89c997bb7b 100644 (file)
--- a/config/rootfiles/common/coreutils
+++ b/config/rootfiles/common/coreutils
@@ -20,8 +20,7 @@ bin/rmdir
 bin/sleep
 bin/sync
 bin/true
-#bin/uname
-bin/uname.bak
+bin/uname
 etc/dircolors
 usr/bin/[
 usr/bin/basename

diff --git a/lfs/coreutils b/lfs/coreutils
index d5c437dd102b31c938b853a211132d91cb5705cf..7bdc0ecd380e31fbc9c807e06e8dd4fbf0b23e0f 100644 (file)
--- 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        #
@@ -108,15 +108,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
-       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
-       cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname
-       chmod 755 /tools/bin/uname
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/flash-images b/lfs/flash-images
index fb1ca3da9902435704c0876b7273782b81346740..7888423b671378d36b74c144d9f8a74adbdd4aef 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -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        #
@@ -90,7 +90,6 @@ endif
        echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
        echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
        -touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
-       mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname
        mkdir $(MNThdd)/proc
        mount --bind /proc $(MNThdd)/proc
        mount --bind /dev  $(MNThdd)/dev

diff --git a/lfs/xen-image b/lfs/xen-image
index 4ab32b49241a96e6d6ed8188ed4f8c17aaed182a..bd46b641ae6098f56abec891ae2aecc75852b637 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -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        #
@@ -115,7 +115,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
        echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
        touch $(MNThdd)/lib/modules/$(KVER)-ipfire-xen/modules.dep
-       mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname
        mkdir $(MNThdd)/proc
        mount --bind /proc $(MNThdd)/proc
        mount --bind /dev  $(MNThdd)/dev

diff --git a/make.sh b/make.sh
index 2c8f231e04a2bc2f35c34379910515143a7ee196..1edcf1571fe9707a032214838d8c37972f384f13 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=2
+TOOLCHAINVER=3
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 799059a3b82b115307b88041d71c524fcf53ba58..daa1c3f26f2aa92787b390464895b234eb257923 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -463,9 +463,6 @@ int main(int argc, char *argv[])
        /* Save language und local settings */
        write_lang_configs(shortlangname);
 
-       /* Rename uname */
-       rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
-
        /* mount proc filesystem */
        mysystem("mkdir /harddisk/proc");
        mysystem("/bin/mount --bind /proc /harddisk/proc");