From 857d9bf244354fcc0899ba19073135541bd82596 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 8 Oct 2006 14:39:28 +0000 Subject: [PATCH] Zwischencommit fuer LFS. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@305 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/binutils | 7 +++---- lfs/cleanup-toolchain | 7 +++---- lfs/coreutils | 2 +- lfs/fetchmail | 4 ++-- lfs/gcc | 16 ++++++---------- lfs/logwatch | 2 +- lfs/ncurses | 6 +++--- lfs/perl | 9 +++++---- lfs/squid-graph | 8 +------- make.sh | 12 ++++++------ 10 files changed, 31 insertions(+), 42 deletions(-) diff --git a/lfs/binutils b/lfs/binutils index 408fdafb24..0f31ce844a 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -38,8 +38,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls - EXTRA_MAKE = tooldir=/usr LD_LIBRARY_PATH=/usr/lib - EXTRA_INSTALL = tooldir=/usr LD_LIBRARY_PATH=/usr/lib + EXTRA_MAKE = tooldir=/usr + EXTRA_INSTALL = tooldir=/usr else ifeq "$(PASS)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-tools1 @@ -97,8 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(PASS)" "1" cd $(DIR_SRC)/binutils-build && make configure-host endif - # $(MAKETUNING) stil is disabled here - cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) + cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install ifeq "$(ROOT)" "" cp -v $(DIR_APP)/include/libiberty.h /usr/include diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain index a5cffbb259..a818222025 100644 --- a/lfs/cleanup-toolchain +++ b/lfs/cleanup-toolchain @@ -56,10 +56,9 @@ ifeq "$(PASS)" "1" mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old} cp -v /tools/bin/{ld-new,ld} ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld - /tools/bin/gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs + gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs > tempspecfile mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs - GCC_INCLUDEDIR=/tools/lib/gcc/i686-pc-linux-gnu/4.0.3/include find /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/include/*` endif @@ -76,7 +75,7 @@ ifeq "$(PASS)" "3" ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld gcc -dumpspecs | \ perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \ - -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \ - `dirname $(gcc --print-libgcc-file-name)`/specs + -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \ + /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs endif @$(POSTBUILD) diff --git a/lfs/coreutils b/lfs/coreutils index 35731e6493..5c0284c7ed 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -104,7 +104,7 @@ ifeq "$(ROOT)" "" mv -v /usr/bin/chroot /usr/sbin mv -v /usr/bin/{head,sleep,nice} /bin ln -sf test /bin/[ - ln -sf ../../bin/install /usr/bin + #ln -sf ../../bin/install /usr/bin mv -f /bin/uname /bin/uname.bak echo '#!/bin/bash' > /bin/uname echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname diff --git a/lfs/fetchmail b/lfs/fetchmail index 43c0d5d6af..d61174b684 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -30,11 +30,11 @@ VER = 6.3.4 THISAPP = fetchmail-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = http://download2.berlios.de/fetchmail +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fetchmail -PAK_VER = ipfire-beta1 +PAK_VER = 1 ############################################################################### # Top-level Rules diff --git a/lfs/gcc b/lfs/gcc index 0cfaf72ff7..2679c35676 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -43,20 +43,16 @@ ifeq "$(ROOT)" "" --libexecdir=/usr/lib --enable-shared \ --enable-threads=posix --enable-__cxa_atexit \ --enable-clocale=gnu --enable-languages=c,c++ \ - --disable-nls \ - --host=i686-pc-linux-gnu \ - --target=$(BUILDTARGET) -# This is not taken from the LFS but a fix, -# because the compiler tries to do a cross-compile. - EXTRA_MAKE = LD_LIBRARY_PATH=/usr/lib - EXTRA_INSTALL = LD_LIBRARY_PATH=/usr/lib + --disable-nls + EXTRA_MAKE = + EXTRA_INSTALL = else ifeq "$(PASS)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-tools1 EXTRA_CONFIG = --prefix=/tools \ --with-local-prefix=/tools --disable-nls --enable-shared \ --enable-languages=c - EXTRA_MAKE = bootstrap #BOOT_LDFLAGS="-static" + EXTRA_MAKE = bootstrap BOOT_LDFLAGS="-static" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools2 @@ -75,9 +71,9 @@ endif ############################################################################### objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +$(DL_FILE = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6ff1af12c53cbb3f79b27f2d6a9a3d50 +$(DL_FILE)_MD5 = 6ff1af12c53cbb3f79b27f2d6a9a3d50 install : $(TARGET) diff --git a/lfs/logwatch b/lfs/logwatch index 1c02cd00c8..0bbb54e198 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -36,7 +36,7 @@ VER = 6.1.2 THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = ftp://ftp.kaybee.org/pub/old/linux +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/lfs/ncurses b/lfs/ncurses index 691d4e5dd5..c589c58693 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -103,9 +103,9 @@ ifeq "$(ROOT)" "" ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \ done ln -sfv libncurses++w.a /usr/lib/libncurses++.a4 - echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so && - ln -sfv libncurses.so /usr/lib/libcurses.so && - ln -sfv libncursesw.a /usr/lib/libcursesw.a && + echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so + ln -sfv libncurses.so /usr/lib/libcurses.so + ln -sfv libncursesw.a /usr/lib/libcursesw.a ln -sfv libncurses.a /usr/lib/libcurses.a endif @rm -rf $(DIR_APP) diff --git a/lfs/perl b/lfs/perl index 14294ccf01..38ef2a3260 100644 --- a/lfs/perl +++ b/lfs/perl @@ -84,13 +84,14 @@ ifneq "$(ROOT)" "" endif ifeq "$(ROOT)" "" cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \ - -Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR" \ - -Dmyhostname=localhost + -Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR" cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install else - cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX' -Dmyhostname=localhost - cd $(DIR_APP) && make $(MAKETUNING) perl utilities + cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX' + cd $(DIR_APP) && sed -i 's/^0$$//' makefile + cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile + cd $(DIR_APP) && make perl utilities cd $(DIR_APP) && cp -v perl pod/pod2man /tools/bin cd $(DIR_APP) && mkdir -pv /tools/lib/perl5/$(VER) cd $(DIR_APP) && cp -Rv lib/* /tools/lib/perl5/$(VER) diff --git a/lfs/squid-graph b/lfs/squid-graph index 6aca6db106..11238df25c 100644 --- a/lfs/squid-graph +++ b/lfs/squid-graph @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: squid-graph,v 1.3.2.2 2005/02/05 15:38:16 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -36,7 +30,7 @@ VER = 3.1 THISAPP = squid-graph-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://squid-graph.securlogic.com/files/stable +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) diff --git a/make.sh b/make.sh index dc07e006b2..1d8ad9824a 100644 --- a/make.sh +++ b/make.sh @@ -28,7 +28,7 @@ VERSION="2.0" # Version number SLOGAN="www.ipfire.eu" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level -MAX_RETRIES=3 # prefetch/check loop +MAX_RETRIES=1 # prefetch/check loop KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` SVN_REVISION=`svn info | grep Revision | cut -c 11-` @@ -177,10 +177,10 @@ prepareenv() { # Make all sources and proc available under lfs build mount --bind /dev $BASEDIR/build/dev - mount -t devpts devpts $BASEDIR/build/dev/pts - mount -t tmpfs shm $BASEDIR/build/dev/shm - mount -t proc proc $BASEDIR/build/proc - mount -t sysfs sysfs $BASEDIR/build/sys + mount --bind /dev/pts $BASEDIR/build/dev/pts + mount --bind /dev/shm $BASEDIR/build/dev/shm + mount --bind /proc $BASEDIR/build/proc + mount --bind /sys $BASEDIR/build/sys mount --bind $BASEDIR/cache $BASEDIR/build/usr/src/cache mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config @@ -811,7 +811,7 @@ prefetch) mkdir $BASEDIR/cache fi mkdir -p $BASEDIR/log - echo "`date -u '+%b %e %T'`:Preload all source files" | tee -a $LOGFILE + echo -e "${BOLD}Preload all source files${NORMAL}" | tee -a $LOGFILE FINISHED=0 cd $BASEDIR/lfs for c in `seq $MAX_RETRIES`; do -- 2.39.2