SMP entfernt / gd hinzugefügt!

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

diff --git a/lfs/Config b/lfs/Config
index eb4e7eb647f2ba7997c4eccc2765620a65b7a0ff..7615fd7c2b7b56db5d435f9f030713bf9a010290 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -49,6 +49,7 @@ DIR_INFO    = $(LFS_BASEDIR)/log
 DIR_TMP     = /tmp
 
 KGCC = ccache /usr/bin/gcc
+KVER = 2.4.31
 
 ###############################################################################
 # Common Macro Definitions

diff --git a/lfs/gd b/lfs/gd
new file mode 100644 (file)
index 0000000..519ae5e
--- /dev/null
+++ b/lfs/gd
@@ -0,0 +1,88 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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 IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: gd,v 1.5.2.4 2005/03/04 19:26:50 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.0.20
+
+THISAPP    = gd-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://www.boutell.com/gd/http
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3e513bf438a8d797b508a4fbf52c9bd1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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 --disable-nls
+       cd $(DIR_APP) && sed -i \
+           -e 's%^#include "jpeglib.h".*$$%%' \
+           -e 's%^#include "jerror.h".*$$%%' gd_jpeg.c
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/ipac-ng b/lfs/ipac-ng
index 6754995cf99373da37a125c6d17f1f5192d61727..bf4bfd45b482eeb13f466b80bf5dea965c6d0974 100644 (file)
--- a/lfs/ipac-ng
+++ b/lfs/ipac-ng
@@ -78,7 +78,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-iptables-1.3.1.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-iptables-1.3.1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fetchcounter.patch
        cd $(DIR_APP) && sed -i -e 's%/var/lib/ipac%/var/log/ip-acct%g' configure
        cd $(DIR_APP) && chmod 755 configure

diff --git a/make.sh b/make.sh
index 71cbd2d69d6badf6055b5acfe4420ebacddcf8da..9f4b92197a0c76862fb19b69678901eaae986594 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -500,27 +500,27 @@ buildipcop() {
   ipcopmake rp-pppoe
   ipcopmake unzip
   # Do SMP now
-  if [ 'i386' = $MACHINE ]; then 
-       # abuse the SMP flag, and make an minimal installer kernel first
-       # so that the boot floppy always works.....
-       ipcopmake linux         LFS_PASS=ipcop SMP=installer
-       ipcopmake linux         LFS_PASS=ipcop SMP=1
-       ipcopmake 3cp4218       SMP=1
-       ipcopmake amedyn        SMP=1
-       ipcopmake cxacru        SMP=1
-       ipcopmake eagle         SMP=1
-
-       # These are here because they have i386 only binary libraries
-       # included in the package.
-       ipcopmake cnx_pci       SMP=1
-       ipcopmake fcdsl         SMP=1
-       ipcopmake fcdsl2        SMP=1
-       ipcopmake fcdslsl       SMP=1
-       ipcopmake fcdslusb      SMP=1
-       ipcopmake fcdslslusb    SMP=1
-       ipcopmake pulsar        SMP=1
-       ipcopmake unicorn       SMP=1
-  fi
+#  if [ 'i386' = $MACHINE ]; then 
+#      # abuse the SMP flag, and make an minimal installer kernel first
+#      # so that the boot floppy always works.....
+#      ipcopmake linux         LFS_PASS=ipcop SMP=installer
+#      ipcopmake linux         LFS_PASS=ipcop SMP=1
+#      ipcopmake 3cp4218       SMP=1
+#      ipcopmake amedyn        SMP=1
+#      ipcopmake cxacru        SMP=1
+#      ipcopmake eagle         SMP=1
+#
+#      # These are here because they have i386 only binary libraries
+#      # included in the package.
+#      ipcopmake cnx_pci       SMP=1
+#      ipcopmake fcdsl         SMP=1
+#      ipcopmake fcdsl2        SMP=1
+#      ipcopmake fcdslsl       SMP=1
+#      ipcopmake fcdslusb      SMP=1
+#      ipcopmake fcdslslusb    SMP=1
+#      ipcopmake pulsar        SMP=1
+#      ipcopmake unicorn       SMP=1
+#  fi
 
   ipcopmake linux      LFS_PASS=ipcop
   ipcopmake 3cp4218