From 920b610fa0f0b404bb323c06b4f2e43105ce57c6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 31 Dec 2011 02:45:19 +0100 Subject: [PATCH] toolchain: remove old uname hack. --- config/rootfiles/common/coreutils | 3 +-- lfs/coreutils | 8 +------- lfs/flash-images | 3 +-- lfs/xen-image | 3 +-- make.sh | 2 +- src/install+setup/install/main.c | 3 --- 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils index 22094c7e2a..3901b697eb 100644 --- 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 d5c437dd10..7bdc0ecd38 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 # # # # 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 fb1ca3da99..7888423b67 100644 --- 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 # # # # 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 4ab32b4924..bd46b641ae 100644 --- 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 # # # # 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 2c8f231e04..1edcf1571f 100755 --- 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 799059a3b8..daa1c3f26f 100644 --- 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"); -- 2.39.2