2 Buildfixes...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@361 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1fef21a880d4c3679f4bf4bc34ac76fdb63c189c..24a7d43fffa6ffb4abbc1ed164aa404184cf9c7e 100644 (file)
--- 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 b938b229f22d8f8c5932048114a3901cb3e75607..6c233ec6660685b79804e1eb0dca376086c17de4 100644 (file)
--- 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 8264a699b3c313d0dfdd1be11614a7f7d617ad2f..74e92c6ac723fe12c792d1bd68291a77db8aacc3 100644 (file)
--- 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 bbc5420b79b0c13b76e8d305d9eedea2a4bcb07b..e2f4e09c1fd44c89227ca9b108ef1cd6b115f744 100644 (file)
--- 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/