IPFire-SCM December 2011

ipfire-scm@lists.ipfire.org

1 participants
61 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f4afa6ddf79e0c20bb4e844aade1d1d8eeb9896a
by git＠ipfire.org 31 Dec '11

31 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via f4afa6ddf79e0c20bb4e844aade1d1d8eeb9896a (commit) via 0d738d2385f637d6ca94c655aa61042e85a5f750 (commit) via 920b610fa0f0b404bb323c06b4f2e43105ce57c6 (commit) via 1852d640e3a1a991c7187c8295d3d645b9b93701 (commit) via aa9b916226988023cd0082f8d53d34baeb783d2e (commit) from 683cc8e470f73e3a964191af3e66b90c80495a25 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f4afa6ddf79e0c20bb4e844aade1d1d8eeb9896a Merge: 683cc8e 0d738d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 31 10:33:39 2011 +0100 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/coreutils | 3 +-- lfs/coreutils | 8 +------- lfs/flash-images | 3 +-- lfs/xen-image | 3 +-- make.sh | 9 ++++----- src/install+setup/install/main.c | 3 --- src/scripts/uname | 32 -------------------------------- 7 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 src/scripts/uname Difference in files: diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils index 22094c7..3901b69 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 d5c437d..7bdc0ec 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(a)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 fb1ca3d..7888423 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 <info(a)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 4ab32b4..bd46b64 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 <info(a)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 415c195..1edcf15 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 @@ -240,7 +240,7 @@ buildtoolchain() { ;; # ARM - armv5tel:armv5tel|armv5tel:armv5tejl) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) # These are working. ;; armv5tel:*) @@ -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 diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 799059a..daa1c3f 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"); diff --git a/src/scripts/uname b/src/scripts/uname deleted file mode 100644 index c1996fd..0000000 --- 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0d738d2385f637d6ca94c655aa61042e85a5f750
by git＠ipfire.org 31 Dec '11

31 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 0d738d2385f637d6ca94c655aa61042e85a5f750 (commit) from 920b610fa0f0b404bb323c06b4f2e43105ce57c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d738d2385f637d6ca94c655aa61042e85a5f750 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 31 10:32:24 2011 +0100 scripts: remove fake-uname script. ----------------------------------------------------------------------- Summary of changes: src/scripts/uname | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) delete mode 100644 src/scripts/uname Difference in files: diff --git a/src/scripts/uname b/src/scripts/uname deleted file mode 100644 index c1996fd..0000000 --- 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 920b610fa0f0b404bb323c06b4f2e43105ce57c6
by git＠ipfire.org 31 Dec '11

31 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 920b610fa0f0b404bb323c06b4f2e43105ce57c6 (commit) from 1852d640e3a1a991c7187c8295d3d645b9b93701 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 920b610fa0f0b404bb323c06b4f2e43105ce57c6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 31 02:45:19 2011 +0100 toolchain: remove old uname hack. ----------------------------------------------------------------------- Summary of changes: 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(-) Difference in files: diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils index 22094c7..3901b69 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 d5c437d..7bdc0ec 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(a)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 fb1ca3d..7888423 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 <info(a)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 4ab32b4..bd46b64 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 <info(a)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 2c8f231..1edcf15 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 799059a..daa1c3f 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"); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1852d640e3a1a991c7187c8295d3d645b9b93701
by git＠ipfire.org 30 Dec '11

30 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 1852d640e3a1a991c7187c8295d3d645b9b93701 (commit) via aa9b916226988023cd0082f8d53d34baeb783d2e (commit) from da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1852d640e3a1a991c7187c8295d3d645b9b93701 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Dec 30 23:43:41 2011 +0100 toolchain: allow armv5tel toolchain build on armv7l host. commit aa9b916226988023cd0082f8d53d34baeb783d2e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Dec 30 23:41:39 2011 +0100 toolchain: fix build on ix86. ----------------------------------------------------------------------- Summary of changes: make.sh | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 415c195..2c8f231 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:*) @@ -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 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 683cc8e470f73e3a964191af3e66b90c80495a25
by git＠ipfire.org 29 Dec '11

29 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 683cc8e470f73e3a964191af3e66b90c80495a25 (commit) from 977fc44e2064e4e4cec598c0347c2fb1999ea3dc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 683cc8e470f73e3a964191af3e66b90c80495a25 Author: Robert Möker <robert.moeker(a)ipfire.org> Date: Thu Dec 29 19:35:48 2011 +0100 nagios_nrpe: Add --enable-command-args. ----------------------------------------------------------------------- Summary of changes: lfs/nagios_nrpe | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index 41be3d3..050c929 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-nrpe-group=nobody \ --with-nagios-user=nobody \ --with-nagios-group=nobody \ + --enable-command-args \ ac_cv_lib_wrap_main=no cd $(DIR_APP) && make $(MAKETUNING) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 977fc44e2064e4e4cec598c0347c2fb1999ea3dc
by git＠ipfire.org 29 Dec '11

29 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 977fc44e2064e4e4cec598c0347c2fb1999ea3dc (commit) via f530902b81da9c6d275d7ed2d40341371e1a389e (commit) via 6f5ef200b352a96e9ed7b45a1e64119067c0c98f (commit) from c01c550df8a24dc1591441a6e9c005d2c9261b94 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 977fc44e2064e4e4cec598c0347c2fb1999ea3dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 29 18:59:12 2011 +0100 Support BSD partition tables. commit f530902b81da9c6d275d7ed2d40341371e1a389e Merge: 6f5ef20 c01c550 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 29 16:30:21 2011 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 6f5ef200b352a96e9ed7b45a1e64119067c0c98f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 29 16:29:20 2011 +0100 kernel: Enable support for UFS. Unix File System as it is used in FreeBSD 5.x. No write support enabled. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 10 ++++++---- config/kernel/kernel.config.i586-ipfire-pae | 6 ++++-- config/kernel/kernel.config.i586-ipfire-xen | 6 ++++-- 3 files changed, 14 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 2c08a1b..e2513f0 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.41-ipfire -# Tue May 31 14:26:02 2011 +# Linux kernel version: 2.6.32.45-ipfire +# Thu Dec 29 15:32:08 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3593,7 +3593,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -3642,7 +3644,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 4b23df3..98d222a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -3624,7 +3624,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -3673,7 +3675,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 72fd490..f5c7ba8 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -3385,7 +3385,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -3433,7 +3435,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c01c550df8a24dc1591441a6e9c005d2c9261b94
by git＠ipfire.org 29 Dec '11

29 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c01c550df8a24dc1591441a6e9c005d2c9261b94 (commit) via da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5 (commit) via 4c3656d99deb897a6571fa82da2502df991a657e (commit) via 7c3fec29d0687950251a7fb9828dc3867631487b (commit) via ef9d89aa4e15ba8df328dd01039509cc81aa3410 (commit) via 332cc5e86466c0ac5248ee20ba721c3b4f4267c1 (commit) via cac9daa61b7d8522c55dff5faefd54aeb1c47c32 (commit) via ad768ac98b8b7445460f9402cc217e4fc7d79fbc (commit) via 71d3bfd4553ca94c6a3e8a25554f66eb899cf4a7 (commit) via f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 (commit) via 8bd492fd495cdf954d65052bc1470a08cd13fbd8 (commit) via 5e3aa60749506205f13c6db588930de61e84f46f (commit) via b848d53c8471748c751e1f00cd886ddb9ca0cb02 (commit) via 4c8608f0160f9a0e0b3cbf0adece33ac16baeeb5 (commit) via e23114f49c2cc5d5af3b811fc0e266434606bc9b (commit) via 45abde762d84f351e801596dbd336461959dd157 (commit) from c6f13fa77c23a02d649ed1d56c7a366c3a7a2caa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c01c550df8a24dc1591441a6e9c005d2c9261b94 Merge: c6f13fa da7ab3c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 29 14:03:42 2011 +0100 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/54/filelists/GeoIP | 1 + config/rootfiles/core/54/filelists/files | 1 + config/rootfiles/core/54/update.sh | 4 ++ config/rootfiles/installer/glibc | 2 +- config/rootfiles/installer/util-linux | 2 +- lfs/{tunctl => fake-environ} | 22 ++++++++----- make.sh | 29 +++++++++++++++-- src/fake-environ/Makefile | 31 ++++++++++++++++++ src/fake-environ/uname.c | 50 ++++++++++++++++++++++++++++++ tools/make-functions | 27 ++++++++++++++-- 10 files changed, 151 insertions(+), 18 deletions(-) create mode 100644 config/rootfiles/core/54/filelists/GeoIP copy lfs/{tunctl => fake-environ} (86%) create mode 100644 src/fake-environ/Makefile create mode 100644 src/fake-environ/uname.c Difference in files: diff --git a/config/rootfiles/core/54/filelists/GeoIP b/config/rootfiles/core/54/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/54/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files index ff13db6..01c4951 100644 --- a/config/rootfiles/core/54/filelists/files +++ b/config/rootfiles/core/54/filelists/files @@ -12,6 +12,7 @@ etc/rc.d/init.d/snort usr/local/bin/hddshutdown usr/local/bin/makegraphs usr/local/bin/scanhd +srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/media.cgi diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh index 59f97cf..61d1011 100644 --- a/config/rootfiles/core/54/update.sh +++ b/config/rootfiles/core/54/update.sh @@ -44,6 +44,10 @@ done rm -rf /usr/share/usb_modeswitch # +# Flush old snort rules +rm -rf /etc/snort/rules + +# #Extract files extract_files diff --git a/config/rootfiles/installer/glibc b/config/rootfiles/installer/glibc index 73e445e..4a46726 120000 --- a/config/rootfiles/installer/glibc +++ b/config/rootfiles/installer/glibc @@ -1 +1 @@ -../common/glibc \ No newline at end of file +../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/installer/util-linux b/config/rootfiles/installer/util-linux index c8ab83e..f672071 120000 --- a/config/rootfiles/installer/util-linux +++ b/config/rootfiles/installer/util-linux @@ -1 +1 @@ -../common/util-linux \ No newline at end of file +../common/i586/util-linux \ No newline at end of file diff --git a/lfs/fake-environ b/lfs/fake-environ new file mode 100644 index 0000000..b724912 --- /dev/null +++ b/lfs/fake-environ @@ -0,0 +1,58 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0 + +THISAPP = fake-environ +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-tools$(PASS) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : + @$(PREBUILD) + @rm -rf $(DIR_APP) + cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP) + + cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \ + TOOLS_DIR="/tools" + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f98d84a..415c195 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=1 +TOOLCHAINVER=2 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -229,9 +229,28 @@ prepareenv() { } buildtoolchain() { - if [ "$(uname -m)" = "x86_64" ]; then - exiterror "Cannot build toolchain on x86_64. Please use the download." - fi + local error=false + case "${MACHINE}:$(uname -m)" in + # x86 + i586:i586|i586:i686) + # These are working. + ;; + i586:*) + error=true + ;; + + # ARM + armv5tel:armv5tel|armv5tel:armv5tejl) + # These are working. + ;; + armv5tel:*) + error=true + ;; + esac + + ${error} && \ + exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any." + if [ "$(uname -r | grep ipfire)" ]; then exiterror "Cannot build toolchain on ipfire. Please use the download." fi @@ -242,6 +261,7 @@ buildtoolchain() { 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 @@ -253,6 +273,7 @@ buildtoolchain() { fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 + lfsmake1 fake-environ PASS=2 lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu diff --git a/src/fake-environ/Makefile b/src/fake-environ/Makefile new file mode 100644 index 0000000..a75bdf2 --- /dev/null +++ b/src/fake-environ/Makefile @@ -0,0 +1,31 @@ + +ifeq "$(CFLAGS)" "" + $(error CLFAGS not defined.) +endif + +ifeq "$(TOOLS_DIR)" "" + $(error TOOLS_DIR not defined.) +endif + +LIB = libpakfire_preload.so + +SOURCES = $(wildcard *.c) +OBJECTS = $(patsubst %.c,%.o,$(SOURCES)) + +.PHONY: all +all: $(LIB) + +%.o: %.c Makefile + $(CC) $(CFLAGS) -o $@ -c $< + +$(LIB): $(OBJECTS) + $(CC) $(CFLAGS) -shared -o $@ $? -ldl + +.PHONY: install +install: all + -mkdir -pv $(TOOLS_DIR)/lib/ + install -p -m 755 $(LIB) $(TOOLS_DIR)/lib + +.PHONY: clean +clean: + $(LIB) diff --git a/src/fake-environ/uname.c b/src/fake-environ/uname.c new file mode 100644 index 0000000..2485a81 --- /dev/null +++ b/src/fake-environ/uname.c @@ -0,0 +1,50 @@ + + +#include <stdio.h> +#include <string.h> +#include <dlfcn.h> +#include <stdlib.h> /* for EXIT_FAILURE */ +#include <unistd.h> /* for _exit() */ +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <sys/syslog.h> +#include <sys/utsname.h> + +#ifndef RTLD_NEXT +#define RTLD_NEXT ((void *) -1l) +#endif + +typedef int (*uname_t)(struct utsname * buf); + +static void *get_libc_func(const char *funcname) { + char *error; + + void *func = dlsym(RTLD_NEXT, funcname); + if ((error = dlerror()) != NULL) { + fprintf(stderr, "I can't locate libc function `%s' error: %s", funcname, error); + _exit(EXIT_FAILURE); + } + + return func; +} + +int uname(struct utsname *buf) { + char *env = NULL; + + /* Call real uname to get the information we need. */ + uname_t real_uname = (uname_t)get_libc_func("uname"); + int ret = real_uname((struct utsname *) buf); + + /* Replace release if requested. */ + if ((env = getenv("UTS_RELEASE")) != NULL) { + strncpy(buf->release, env, _UTSNAME_RELEASE_LENGTH); + } + + /* Replace machine type if requested. */ + if ((env = getenv("UTS_MACHINE")) != NULL) { + strncpy(buf->machine, env, _UTSNAME_MACHINE_LENGTH); + } + + return ret; +} diff --git a/tools/make-functions b/tools/make-functions index e693ff9..783b46e 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -225,17 +225,17 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" -elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE ]; then +elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; then echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE MACHINE=armv5tel MACHINE_TYPE=arm BUILDTARGET=${MACHINE}-unknown-linux-gnueabi - CFLAGS="-O2 -march=armv5te -fomit-frame-pointer -pipe" + CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe" CXXFLAGS="$CFLAGS" C2FLAGS="$CFLAGS" CXX2FLAGS="$CXXFLAGS" else - echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" >> $LOGFILE + echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" exit 1 fi @@ -270,10 +270,26 @@ exiterror() { exit 1 } +fake_environ() { + [ -e "${BASEDIR}/build/tools/lib/libpakfire_preload.so" ] || return + + local env="LD_PRELOAD=/tools/lib/libpakfire_preload.so" + + # Fake kernel version, because some of the packages do not compile + # with kernel 3.0 and later. + env="${env} UTS_RELEASE=${KVER}" + + # Fake machine version. + env="${env} UTS_MACHINE=${MACHINE}" + + echo "${env}" +} + entershell() { if [ ! -e $BASEDIR/build/usr/src/lfs/ ]; then exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/" fi + echo "Entering to a shell inside LFS chroot, go out with exit" $linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \ PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ @@ -288,6 +304,7 @@ entershell() { MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ KGCC="ccache /usr/bin/gcc" \ + $(fake_environ) \ /tools/bin/bash if [ $? -ne 0 ]; then beautify message FAIL @@ -371,6 +388,7 @@ lfsmake1() { ROOT=$LFS \ KVER=$KVER \ MAKETUNING=$MAKETUNING \ + $(fake_environ) \ install >> $LOGFILE 2>&1 local COMPILE_SUCCESS=$? local PKG_TIME_END=`date +%s` @@ -401,6 +419,7 @@ lfsmake2() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /tools/bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 local COMPILE_SUCCESS=$? @@ -433,6 +452,7 @@ ipfiremake() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 @@ -464,6 +484,7 @@ ipfiredist() { KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5
by git＠ipfire.org 29 Dec '11

29 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5 (commit) via f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 (commit) via 8bd492fd495cdf954d65052bc1470a08cd13fbd8 (commit) via 5e3aa60749506205f13c6db588930de61e84f46f (commit) via b848d53c8471748c751e1f00cd886ddb9ca0cb02 (commit) from 4c3656d99deb897a6571fa82da2502df991a657e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5 Merge: 4c3656d f13d4e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 29 13:50:55 2011 +0100 Merge remote-tracking branch 'ms/fake-uname' Conflicts: lfs/fake-environ commit f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 13:22:24 2011 +0100 Fix detection weather a toolchain can be built on host. commit 8bd492fd495cdf954d65052bc1470a08cd13fbd8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 13:15:27 2011 +0100 CFLAGS: Explicitely enforce softfp. commit 5e3aa60749506205f13c6db588930de61e84f46f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 12:29:54 2011 +0100 Enable build for armv5tel on armv7l. commit b848d53c8471748c751e1f00cd886ddb9ca0cb02 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 12:17:19 2011 +0100 Build preload lib to fake output of uname. ----------------------------------------------------------------------- Summary of changes: lfs/fake-environ | 2 +- make.sh | 25 ++++++++++++++++++++++--- tools/make-functions | 6 +++--- 3 files changed, 26 insertions(+), 7 deletions(-) Difference in files: diff --git a/lfs/fake-environ b/lfs/fake-environ index 7a0f1a4..b724912 100644 --- a/lfs/fake-environ +++ b/lfs/fake-environ @@ -52,7 +52,7 @@ $(TARGET) : cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP) cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \ - TOOLS_DIR="$(TOOLS_DIR)" + TOOLS_DIR="/tools" @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8b9f48a..415c195 100755 --- a/make.sh +++ b/make.sh @@ -229,9 +229,28 @@ prepareenv() { } buildtoolchain() { - if [ "$(uname -m)" = "x86_64" ]; then - exiterror "Cannot build toolchain on x86_64. Please use the download." - fi + local error=false + case "${MACHINE}:$(uname -m)" in + # x86 + i586:i586|i586:i686) + # These are working. + ;; + i586:*) + error=true + ;; + + # ARM + armv5tel:armv5tel|armv5tel:armv5tejl) + # These are working. + ;; + armv5tel:*) + error=true + ;; + esac + + ${error} && \ + exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any." + if [ "$(uname -r | grep ipfire)" ]; then exiterror "Cannot build toolchain on ipfire. Please use the download." fi diff --git a/tools/make-functions b/tools/make-functions index 144411c..783b46e 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -225,17 +225,17 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" -elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE ]; then +elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; then echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE MACHINE=armv5tel MACHINE_TYPE=arm BUILDTARGET=${MACHINE}-unknown-linux-gnueabi - CFLAGS="-O2 -march=armv5te -fomit-frame-pointer -pipe" + CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe" CXXFLAGS="$CFLAGS" C2FLAGS="$CFLAGS" CXX2FLAGS="$CXXFLAGS" else - echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" >> $LOGFILE + echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" exit 1 fi hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4c3656d99deb897a6571fa82da2502df991a657e
by git＠ipfire.org 29 Dec '11

29 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 4c3656d99deb897a6571fa82da2502df991a657e (commit) via 4c8608f0160f9a0e0b3cbf0adece33ac16baeeb5 (commit) from 7c3fec29d0687950251a7fb9828dc3867631487b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4c3656d99deb897a6571fa82da2502df991a657e Merge: 4c8608f 7c3fec2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 28 16:46:46 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit 4c8608f0160f9a0e0b3cbf0adece33ac16baeeb5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 12:17:19 2011 +0100 Build preload lib to fake output of uname. ----------------------------------------------------------------------- Summary of changes: lfs/{tunctl => fake-environ} | 22 +++++++++++------- make.sh | 4 ++- src/fake-environ/Makefile | 31 ++++++++++++++++++++++++++ src/fake-environ/uname.c | 50 ++++++++++++++++++++++++++++++++++++++++++ tools/make-functions | 21 +++++++++++++++++ 5 files changed, 118 insertions(+), 10 deletions(-) copy lfs/{tunctl => fake-environ} (86%) create mode 100644 src/fake-environ/Makefile create mode 100644 src/fake-environ/uname.c Difference in files: diff --git a/lfs/fake-environ b/lfs/fake-environ new file mode 100644 index 0000000..7a0f1a4 --- /dev/null +++ b/lfs/fake-environ @@ -0,0 +1,58 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0 + +THISAPP = fake-environ +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-tools$(PASS) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : + @$(PREBUILD) + @rm -rf $(DIR_APP) + cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP) + + cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \ + TOOLS_DIR="$(TOOLS_DIR)" + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f98d84a..8b9f48a 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=1 +TOOLCHAINVER=2 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -242,6 +242,7 @@ buildtoolchain() { 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 @@ -253,6 +254,7 @@ buildtoolchain() { fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 + lfsmake1 fake-environ PASS=2 lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu diff --git a/src/fake-environ/Makefile b/src/fake-environ/Makefile new file mode 100644 index 0000000..a75bdf2 --- /dev/null +++ b/src/fake-environ/Makefile @@ -0,0 +1,31 @@ + +ifeq "$(CFLAGS)" "" + $(error CLFAGS not defined.) +endif + +ifeq "$(TOOLS_DIR)" "" + $(error TOOLS_DIR not defined.) +endif + +LIB = libpakfire_preload.so + +SOURCES = $(wildcard *.c) +OBJECTS = $(patsubst %.c,%.o,$(SOURCES)) + +.PHONY: all +all: $(LIB) + +%.o: %.c Makefile + $(CC) $(CFLAGS) -o $@ -c $< + +$(LIB): $(OBJECTS) + $(CC) $(CFLAGS) -shared -o $@ $? -ldl + +.PHONY: install +install: all + -mkdir -pv $(TOOLS_DIR)/lib/ + install -p -m 755 $(LIB) $(TOOLS_DIR)/lib + +.PHONY: clean +clean: + $(LIB) diff --git a/src/fake-environ/uname.c b/src/fake-environ/uname.c new file mode 100644 index 0000000..2485a81 --- /dev/null +++ b/src/fake-environ/uname.c @@ -0,0 +1,50 @@ + + +#include <stdio.h> +#include <string.h> +#include <dlfcn.h> +#include <stdlib.h> /* for EXIT_FAILURE */ +#include <unistd.h> /* for _exit() */ +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <sys/syslog.h> +#include <sys/utsname.h> + +#ifndef RTLD_NEXT +#define RTLD_NEXT ((void *) -1l) +#endif + +typedef int (*uname_t)(struct utsname * buf); + +static void *get_libc_func(const char *funcname) { + char *error; + + void *func = dlsym(RTLD_NEXT, funcname); + if ((error = dlerror()) != NULL) { + fprintf(stderr, "I can't locate libc function `%s' error: %s", funcname, error); + _exit(EXIT_FAILURE); + } + + return func; +} + +int uname(struct utsname *buf) { + char *env = NULL; + + /* Call real uname to get the information we need. */ + uname_t real_uname = (uname_t)get_libc_func("uname"); + int ret = real_uname((struct utsname *) buf); + + /* Replace release if requested. */ + if ((env = getenv("UTS_RELEASE")) != NULL) { + strncpy(buf->release, env, _UTSNAME_RELEASE_LENGTH); + } + + /* Replace machine type if requested. */ + if ((env = getenv("UTS_MACHINE")) != NULL) { + strncpy(buf->machine, env, _UTSNAME_MACHINE_LENGTH); + } + + return ret; +} diff --git a/tools/make-functions b/tools/make-functions index e693ff9..144411c 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -270,10 +270,26 @@ exiterror() { exit 1 } +fake_environ() { + [ -e "${BASEDIR}/build/tools/lib/libpakfire_preload.so" ] || return + + local env="LD_PRELOAD=/tools/lib/libpakfire_preload.so" + + # Fake kernel version, because some of the packages do not compile + # with kernel 3.0 and later. + env="${env} UTS_RELEASE=${KVER}" + + # Fake machine version. + env="${env} UTS_MACHINE=${MACHINE}" + + echo "${env}" +} + entershell() { if [ ! -e $BASEDIR/build/usr/src/lfs/ ]; then exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/" fi + echo "Entering to a shell inside LFS chroot, go out with exit" $linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \ PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ @@ -288,6 +304,7 @@ entershell() { MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ KGCC="ccache /usr/bin/gcc" \ + $(fake_environ) \ /tools/bin/bash if [ $? -ne 0 ]; then beautify message FAIL @@ -371,6 +388,7 @@ lfsmake1() { ROOT=$LFS \ KVER=$KVER \ MAKETUNING=$MAKETUNING \ + $(fake_environ) \ install >> $LOGFILE 2>&1 local COMPILE_SUCCESS=$? local PKG_TIME_END=`date +%s` @@ -401,6 +419,7 @@ lfsmake2() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /tools/bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 local COMPILE_SUCCESS=$? @@ -433,6 +452,7 @@ ipfiremake() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 @@ -464,6 +484,7 @@ ipfiredist() { KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c6f13fa77c23a02d649ed1d56c7a366c3a7a2caa
by git＠ipfire.org 29 Dec '11

29 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c6f13fa77c23a02d649ed1d56c7a366c3a7a2caa (commit) from 977a52e66930c36acc4db3d9eb1675ce1647300f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c6f13fa77c23a02d649ed1d56c7a366c3a7a2caa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 29 13:44:09 2011 +0100 nagios_nrpe: Disable linking against tcpwrappers. tcpwrappers is $%&"$%&/ and just causing headaches. Use the stupid firewall if you want to block access from remote hosts. ----------------------------------------------------------------------- Summary of changes: lfs/nagios_nrpe | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index 34bc5a8..41be3d3 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nagios_nrpe -PAK_VER = 1 +PAK_VER = 2 DEPS = "nagios" @@ -78,9 +78,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib/nagios \ - --with-nrpe-user=nobody --with-nrpe-group=nobody \ - --with-nagios-user=nobody --with-nagios-group=nobody + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/nagios \ + --with-nrpe-user=nobody \ + --with-nrpe-group=nobody \ + --with-nagios-user=nobody \ + --with-nagios-group=nobody \ + ac_cv_lib_wrap_main=no + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2011