diff --git a/config/rootfiles/core/54/filelists/GeoIP b/config/rootfiles/core/54/filelists/GeoIP
new file mode 100644
index 000000000..0258236c0
--- /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 ff13db675..01c4951df 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 59f97cfc8..61d10113d 100644
--- a/config/rootfiles/core/54/update.sh
+++ b/config/rootfiles/core/54/update.sh
@@ -43,6 +43,10 @@ done
# Flush old usb-modeswitch data
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 73e445e7a..4a4672680 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 c8ab83eac..f672071b7 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 000000000..b72491253
--- /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 . #
+# #
+###############################################################################
+
+###############################################################################
+# 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 f98d84ad2..415c19588 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 000000000..a75bdf27f
--- /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 000000000..2485a810f
--- /dev/null
+++ b/src/fake-environ/uname.c
@@ -0,0 +1,50 @@
+
+
+#include
+#include
+#include
+#include /* for EXIT_FAILURE */
+#include /* for _exit() */
+#include
+#include
+#include
+#include
+#include
+
+#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 e693ff94f..783b46e14 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