From 8eec218432ea1bd797cfea96ca5cb90a10e428e9 Mon Sep 17 00:00:00 2001 From: ms Date: Tue, 12 Dec 2006 21:18:36 +0000 Subject: [PATCH] 2 Buildfixes... git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@361 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/ChangeLog | 110 ++++++++++++++++++++++++++++++++++++++++++ doc/packages-list.txt | 3 -- lfs/linux | 5 +- lfs/rrdtool | 2 +- 4 files changed, 114 insertions(+), 6 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 1fef21a880..24a7d43fff 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,113 @@ +------------------------------------------------------------------------ +r360 | ms | 2006-12-11 21:02:07 +0100 (Mon, 11 Dec 2006) | 5 lines + +Patch-O-Matic in den Kernel eingebaut. +(Einige Module fehlen noch...) +Unattended Installer bearbeitet. +Firewallscript hinzugefuegt. + +------------------------------------------------------------------------ +r359 | ms | 2006-12-08 17:27:26 +0100 (Fri, 08 Dec 2006) | 3 lines + +IPTables in Kernel aktiviert. +Netzwork-Script Phase 1 + +------------------------------------------------------------------------ +r358 | ms | 2006-12-08 13:41:21 +0100 (Fri, 08 Dec 2006) | 4 lines + +Kernel angepasst. +Bootprozess bearbeitet. +Console vorlaeufig auf Deutsch eingestellt bis das Setup geht. + +------------------------------------------------------------------------ +r357 | ms | 2006-12-05 22:57:32 +0100 (Tue, 05 Dec 2006) | 4 lines + +Starte SSH-Server beim Boot. +Starte Cron-Server beim Boot. +Apache bearbeitet. + +------------------------------------------------------------------------ +r356 | ms | 2006-12-05 22:42:19 +0100 (Tue, 05 Dec 2006) | 2 lines + +Installer-Pfade gefixxt. + +------------------------------------------------------------------------ +r355 | ms | 2006-12-05 15:32:03 +0100 (Tue, 05 Dec 2006) | 2 lines + +Einige Buildfixes + +------------------------------------------------------------------------ +r354 | ms | 2006-12-02 23:38:39 +0100 (Sat, 02 Dec 2006) | 2 lines + +System ist mittels LFS Bootscripte startbar. + +------------------------------------------------------------------------ +r353 | ms | 2006-11-30 22:30:57 +0100 (Thu, 30 Nov 2006) | 2 lines + +... Viel zu tun :D + +------------------------------------------------------------------------ +r352 | ms | 2006-11-28 22:27:53 +0100 (Tue, 28 Nov 2006) | 2 lines + +Kleiner netter neuer Versuch. + +------------------------------------------------------------------------ +r351 | ms | 2006-11-28 21:05:18 +0100 (Tue, 28 Nov 2006) | 3 lines + +PXE Boot integriert. +Installerarbeit fortgesetzt. + +------------------------------------------------------------------------ +r350 | ms | 2006-11-26 22:34:31 +0100 (Sun, 26 Nov 2006) | 2 lines + +Installer lauft durch und IDE Systeme booten :D + +------------------------------------------------------------------------ +r349 | ms | 2006-11-26 13:52:27 +0100 (Sun, 26 Nov 2006) | 2 lines + +Installer + +------------------------------------------------------------------------ +r348 | ms | 2006-11-21 22:24:16 +0100 (Tue, 21 Nov 2006) | 2 lines + +Eine Menge Buildfixes... + +------------------------------------------------------------------------ +r347 | ms | 2006-11-20 23:04:37 +0100 (Mon, 20 Nov 2006) | 2 lines + +Weitere Arbeit am Installer + +------------------------------------------------------------------------ +r346 | ms | 2006-11-20 20:56:08 +0100 (Mon, 20 Nov 2006) | 2 lines + +Kudzu, ReiserFS, uClibc, gettext und Arbeit am Installer + +------------------------------------------------------------------------ +r345 | ms | 2006-11-11 17:23:31 +0100 (Sat, 11 Nov 2006) | 2 lines + +Uptime-CGI vom gruenen Testfire kopiert. + +------------------------------------------------------------------------ +r344 | ms | 2006-11-08 23:58:14 +0100 (Wed, 08 Nov 2006) | 2 lines + +Clamav und OpenVPN Update. + +------------------------------------------------------------------------ +r343 | ms | 2006-11-08 23:30:51 +0100 (Wed, 08 Nov 2006) | 2 lines + +Bootvorgang des Installers weitergebracht. + +------------------------------------------------------------------------ +r342 | ms | 2006-11-07 21:23:46 +0100 (Tue, 07 Nov 2006) | 2 lines + +Install-Initrd finalisiert.. + +------------------------------------------------------------------------ +r341 | ms | 2006-11-06 20:55:55 +0100 (Mon, 06 Nov 2006) | 3 lines + +Installmake bearbeitet. (TESTING) +fstab gefixt. + ------------------------------------------------------------------------ r340 | ms | 2006-11-06 19:03:48 +0100 (Mon, 06 Nov 2006) | 2 lines diff --git a/doc/packages-list.txt b/doc/packages-list.txt index b938b229f2..6c233ec666 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -91,12 +91,10 @@ * hdparm-6.6 * htop-0.6.2 * httpd-2.2.2 -* hwinfo * iana-etc-2.10 * ibod * iftop-0.17 * inetutils-1.4.2 -* initscripts_old * ipac-ng-1.31 * ipaddr-1.2 * iproute2-2.6.16-060323 @@ -166,7 +164,6 @@ * openldap-2.3.20 * openssh-4.3p2 * openssl-0.9.8d -* openswan-2.4.6 * openswan-2.4.7 * openvpn-2.0.9 * pam_mysql-0.7RC1 diff --git a/lfs/linux b/lfs/linux index 8264a699b3..74e92c6ac7 100644 --- a/lfs/linux +++ b/lfs/linux @@ -105,6 +105,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + ln -s linux-$(VER) /usr/src/linux # Update kernel to latest patchlevel cd $(DIR_APP) && zcat $(DIR_DL)/patch-$(PATCHLEVEL).gz | patch -p1 @@ -176,7 +177,7 @@ endif cd $(DIR_APP) && make CC="$(KGCC)" oldconfig cd $(DIR_APP) && make CC="$(KGCC)" clean - if [ "$(PASS)" = "" ]; then \ + if [ "$(SMP)" = "" ]; then \ cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \ cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER); \ cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER); \ @@ -187,7 +188,7 @@ endif cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install; \ cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module; \ cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall; \ - elif [ "$(PASS)" = "S" ]; then \ + elif [ "$(SMP)" = "1" ]; then \ cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =/EXTRAVERSION\ =\ -smp/' Makefile; \ cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \ cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-smp; \ diff --git a/lfs/rrdtool b/lfs/rrdtool index bbc5420b79..e2f4e09c1f 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --exec-prefix=/usr --mandir=/usr/share/man \ --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2 \ --disable-python --disable-tcl - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make cd $(DIR_APP) && make install cd $(DIR_APP) && make site-perl-install -mkdir -p /home/httpd/html/graphs/ -- 2.39.2