From aa9b916226988023cd0082f8d53d34baeb783d2e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 30 Dec 2011 23:41:39 +0100 Subject: [PATCH 1/4] toolchain: fix build on ix86. --- make.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index 415c19588..bc13d22e3 100755 --- a/make.sh +++ b/make.sh @@ -260,12 +260,11 @@ buildtoolchain() { NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} ORG_PATH=$PATH - export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH - lfsmake1 fake-environ PASS=1 lfsmake1 ccache PASS=1 lfsmake1 make PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 + export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH if [ "${MACHINE_TYPE}" = "arm" ]; then lfsmake1 linux TOOLS=1 HEADERS=1 else @@ -273,7 +272,7 @@ buildtoolchain() { fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 - lfsmake1 fake-environ PASS=2 + lfsmake1 fake-environ lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu From 1852d640e3a1a991c7187c8295d3d645b9b93701 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 30 Dec 2011 23:43:41 +0100 Subject: [PATCH 2/4] toolchain: allow armv5tel toolchain build on armv7l host. --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index bc13d22e3..2c8f231e0 100755 --- a/make.sh +++ b/make.sh @@ -240,7 +240,7 @@ buildtoolchain() { ;; # ARM - armv5tel:armv5tel|armv5tel:armv5tejl) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) # These are working. ;; armv5tel:*) From 920b610fa0f0b404bb323c06b4f2e43105ce57c6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 31 Dec 2011 02:45:19 +0100 Subject: [PATCH 3/4] 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 22094c7e2..3901b697e 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 d5c437dd1..7bdc0ecd3 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 fb1ca3da9..7888423b6 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 4ab32b492..bd46b641a 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 2c8f231e0..1edcf1571 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 799059a3b..daa1c3f26 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"); From 0d738d2385f637d6ca94c655aa61042e85a5f750 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 31 Dec 2011 10:32:24 +0100 Subject: [PATCH 4/4] scripts: remove fake-uname script. --- src/scripts/uname | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/scripts/uname diff --git a/src/scripts/uname b/src/scripts/uname deleted file mode 100644 index c1996fda1..000000000 --- a/src/scripts/uname +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -uname= -for i in /bin/uname.bak /tools/bin/uname.bak; do - if [ -x "$i" ]; then - uname=${i} - break - fi -done - -if [ -z "${uname}" ]; then - exit 127 -fi - -machine=$(${uname} -m) -kernel=$(${uname} -r) -output=$(${uname} $@) - -# Overwrite kernel version to hack kernel 3.x versions. -output=$(sed -e "s/${kernel}/${KVER}/g" <<<${output}) - -case "${machine}" in - armv*) - echo "${output}" | \ - sed -e "s/armv.*l/${MACHINE}/g" - ;; - - i?86) - echo "${output}" | \ - sed -e "s/i.86/${MACHINE}/g" - ;; -esac