Habe ein Paar lange dagewesene Errors behoben.

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

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index debe08f10bdece5116e0518731085b1e46355023..dbf12c484349dd10b4574543f844da4bea90cff1 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Wed Dec 13 03:25:20 2006
+# Fri Jan  5 01:36:52 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1905,7 +1905,7 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index 82175bdfd0f8a53acc10aa72c68a1205b6ac48cf..75485df24bf04ed2eccb5e905ca2d0f7996d79a0 100644 (file)
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Wed Dec 13 03:25:32 2006
+# Fri Jan  5 01:37:20 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1900,7 +1900,7 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

diff --git a/config/rootfiles/common/isapnptools b/config/rootfiles/common/isapnptools
new file mode 100644 (file)
index 0000000..a6535b9
--- /dev/null
+++ b/config/rootfiles/common/isapnptools
@@ -0,0 +1,20 @@
+#usr/include/isapnp
+#usr/include/isapnp/callbacks.h
+#usr/include/isapnp/errcodes.h
+#usr/include/isapnp/errenum.h
+#usr/include/isapnp/iopl.h
+#usr/include/isapnp/mysnprtf.h
+#usr/include/isapnp/pnp-access.h
+#usr/include/isapnp/pnp.h
+#usr/include/isapnp/realtime.h
+#usr/include/isapnp/release.h
+#usr/include/isapnp/res-access.h
+#usr/include/isapnp/resource.h
+#usr/lib/libisapnp.a
+#usr/man/man5/isapnp.conf.5
+#usr/man/man8/isapnp.8
+#usr/man/man8/pnpdump.8
+usr/sbin/isapnp
+#usr/sbin/pnpdump
+#var/ipfire/isapnp
+#var/ipfire/isapnp/isapnp.conf

diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm
new file mode 100644 (file)
index 0000000..f27ac20
--- /dev/null
+++ b/config/rootfiles/common/linux-atm
@@ -0,0 +1,51 @@
+#etc/atmsigd.conf
+#etc/hosts.atm
+usr/bin/aread
+usr/bin/atmdiag
+#usr/bin/atmdump
+#usr/bin/awrite
+#usr/bin/saaldump
+#usr/bin/sonetdiag
+#usr/bin/ttcp_atm
+#usr/include/atm.h
+#usr/include/atmarp.h
+#usr/include/atmarpd.h
+#usr/include/atmd.h
+#usr/include/atmsap.h
+#usr/lib/libatm.a
+#usr/lib/libatm.la
+usr/lib/libatm.so
+usr/lib/libatm.so.1
+usr/lib/libatm.so.1.0.0
+#usr/man/man4/atmsigd.conf.4
+#usr/man/man7/qos.7
+#usr/man/man7/sap.7
+#usr/man/man8/atmaddr.8
+#usr/man/man8/atmarp.8
+#usr/man/man8/atmarpd.8
+#usr/man/man8/atmdiag.8
+#usr/man/man8/atmdump.8
+#usr/man/man8/atmloop.8
+#usr/man/man8/atmsigd.8
+#usr/man/man8/atmtcp.8
+#usr/man/man8/bus.8
+#usr/man/man8/esi.8
+#usr/man/man8/lecs.8
+#usr/man/man8/les.8
+#usr/man/man8/mpcd.8
+#usr/man/man8/zeppelin.8
+#usr/sbin/atmaddr
+usr/sbin/atmarp
+usr/sbin/atmarpd
+usr/sbin/atmloop
+usr/sbin/atmsigd
+usr/sbin/atmtcp
+#usr/sbin/bus
+#usr/sbin/enitune
+#usr/sbin/esi
+#usr/sbin/ilmid
+#usr/sbin/lecs
+#usr/sbin/les
+#usr/sbin/mpcd
+#usr/sbin/zeppelin
+#usr/sbin/zntune

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 303a2096015ed1d0ae25216a7071b953b56a25de..f73fe01ac8512070548b2a6b6283a649eb89c732 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -130,6 +130,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * linux-2.6.16.29-ipfire
+* linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * logrotate-3.7.1
 * logwatch_7.3.1

diff --git a/lfs/isapnptools b/lfs/isapnptools
index 5d5331f272224e638be911f5faf447fcc72986c6..3535e0d38a2df072ea9664f24e5fc18db44f07ba 100644 (file)
--- a/lfs/isapnptools
+++ b/lfs/isapnptools
@@ -72,6 +72,8 @@ $(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)/src && sed -i -e 's/#ifdef\ ENABLE_PCI/#ifdef\ ENABLE_PCI\n#define\ __KERNEL__\n#include\ <linux\/mod_devicetable.h>\n#undef __KERNEL__/' resource.c
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/isapnptools-1.26-gcc-4.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install

diff --git a/lfs/linux-atm b/lfs/linux-atm
index 2b99550432259cd0ad0fefbdf78a899b7cc5bbf8..07bdf8a288a799ee4a1a7dfab80716125a56587f 100644 (file)
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -72,6 +72,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/linux-atm-2.4.1-gcc-4.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install

diff --git a/lfs/promise-sata-300-tx b/lfs/promise-sata-300-tx
index d9e10d67a9d5b6717c22a9350cc3a80e32ba071b..2352ac320d8f54374408979fd443244bcf61e7e4 100644 (file)
--- a/lfs/promise-sata-300-tx
+++ b/lfs/promise-sata-300-tx
@@ -26,16 +26,16 @@
 
 include Config
 
-VER        = linux2.4_open_source_1.00.0.15
+VER        = linux2.6-src-x86_v1.01.0.20
 
-THISAPP    = sata300_sataii150_tx_series_$(VER)
-DL_FILE    = $(THISAPP).tgz
+THISAPP    = promise_sataii150-300-tx-series-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/pdc-ulsata2
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-else
+DIR_APP    = $(DIR_SRC)/ut_mod
+ifeq "$(SMP)" "1"
   TARGET     = $(DIR_INFO)/$(THISAPP)-smp
+else
+  TARGET     = $(DIR_INFO)/$(THISAPP)
 endif
 
 ###############################################################################
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 369e88bf60321771bfd3ffc1f1d412f5
+$(DL_FILE)_MD5 = 451b836549171756ef85d13db1b85eda
 
 install : $(TARGET)
 
@@ -77,12 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && install -m 644 -o 0 ulsata2.o /lib/modules/$(KVER)/kernel/drivers/scsi
-       find /lib/modules/$(KVER)/kernel/drivers/scsi -name 'ulsata2.o' -a -type f | xargs gzip -f9
+ifeq "$(SMP)" "1"
+       cd $(DIR_APP) && cp -f ulsata2.ko /lib/modules/$(KVER)-smp/kernel/drivers/scsi/ulsata2.ko
 else
-       cd $(DIR_APP) && install -m 644 -o 0 ulsata2.o /lib/modules/$(KVER)-smp/kernel/drivers/scsi
-       find /lib/modules/$(KVER)-smp/kernel/drivers/scsi -name 'ulsata2.o' -a -type f | xargs gzip -f9
+       cd $(DIR_APP) && cp -f ulsata2.ko /lib/modules/$(KVER)/kernel/drivers/scsi/ulsata2.ko
 endif
-       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 20756ab37d4a546f9601200ba646b1a5e8bc6bd0..9100b53a513689988db6303f92d989fc2914e74f 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -319,28 +319,27 @@ buildipfire() {
   ipfiremake dhcpcd
   ipfiremake libusb
   ipfiremake libpcap
-# Temporary disabled.
-#  ipfiremake linux-atm
+  ipfiremake linux-atm
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux                     SMP=1
   ipfiremake ipp2p                     SMP=1
-#  ipfiremake 3cp4218          PASS=SMP
-#  ipfiremake amedyn                   PASS=SMP
-#  ipfiremake cxacru                   PASS=SMP
-#  ipfiremake eagle                    PASS=SMP
-#  ipfiremake cnx_pci          PASS=SMP
-#  ipfiremake fcdsl                    PASS=SMP
-#  ipfiremake fcdsl2                   PASS=SMP
-#  ipfiremake fcdslsl          PASS=SMP
-#  ipfiremake fcdslusb         PASS=SMP
-#  ipfiremake fcdslslusb               PASS=SMP
-#  ipfiremake fcpci                    PASS=SMP
-#  ipfiremake fcclassic                PASS=SMP
-#  ipfiremake pulsar                   PASS=SMP
-#  ipfiremake unicorn          PASS=SMP
-#  ipfiremake promise-sata-300-tx      PASS=SMP
+#  ipfiremake 3cp4218          SMP=1
+#  ipfiremake amedyn                   SMP=1
+#  ipfiremake cxacru                   SMP=1
+#  ipfiremake eagle                    SMP=1
+#  ipfiremake cnx_pci          SMP=1
+#  ipfiremake fcdsl                    SMP=1
+#  ipfiremake fcdsl2                   SMP=1
+#  ipfiremake fcdslsl          SMP=1
+#  ipfiremake fcdslusb         SMP=1
+#  ipfiremake fcdslslusb               SMP=1
+#  ipfiremake fcpci                    SMP=1
+#  ipfiremake fcclassic                SMP=1
+#  ipfiremake pulsar                   SMP=1
+#  ipfiremake unicorn          SMP=1
+#  ipfiremake promise-sata-300-tx      SMP=1
   ipfiremake zaptel                    PASS=S
   ipfiremake linux
   ipfiremake ipp2p
@@ -362,7 +361,6 @@ buildipfire() {
 #  ipfiremake unicorn
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
-#  ipfiremake pcmciautils
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -389,11 +387,10 @@ buildipfire() {
   ipfiremake mysql
   ipfiremake cyrus-sasl
   ipfiremake openldap
-#  ipfiremake cyrus-sasl PASS=L # Doesn't work yet. Thereby there's the question: Do we really need this?
   ipfiremake apache2
   ipfiremake php
   ipfiremake subversion
-  ipfiremake apache2 PASS=C
+  ipfiremake apache2                   PASS=C
   ipfiremake arping
   ipfiremake beep
   ipfiremake bind
@@ -417,7 +414,7 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-#  ipfiremake isapnptools # ERROR :(
+  ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
   ipfiremake kudzu
   ipfiremake logrotate
@@ -428,7 +425,6 @@ buildipfire() {
   ipfiremake nano
   ipfiremake nash
   ipfiremake nasm
-### The Perl Modules have to be updated! I will skip this now!
   ipfiremake URI
   ipfiremake HTML-Tagset
   ipfiremake HTML-Parser
@@ -452,7 +448,6 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake GeoIP
-###
   ipfiremake fwhits
   ipfiremake noip_updater
   ipfiremake ntp
@@ -570,7 +565,6 @@ buildinstaller() {
   installmake sysfsutils
   installmake util-linux
   installmake pciutils
-  installmake pcmciautils
   installmake kudzu
 #  installmake bootsplash
   installmake installer

diff --git a/src/patches/isapnptools-1.26-gcc-4.patch b/src/patches/isapnptools-1.26-gcc-4.patch
new file mode 100644 (file)
index 0000000..33c0750
--- /dev/null
+++ b/src/patches/isapnptools-1.26-gcc-4.patch
@@ -0,0 +1,11 @@
+--- src/isapnp_main.l~ 2007-01-05 00:56:44.000000000 +0000
++++ src/isapnp_main.l  2007-01-05 01:00:18.000000000 +0000
+@@ -363,7 +363,7 @@
+       return 0;
+ }
+ 
+-static unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
++unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
+ static char *boardid[NUM_CARDS+1];
+ static unsigned long serno[NUM_CARDS+1];
+ 

diff --git a/src/patches/linux-atm-2.4.1-gcc-4.patch b/src/patches/linux-atm-2.4.1-gcc-4.patch
new file mode 100644 (file)
index 0000000..f6be9d2
--- /dev/null
+++ b/src/patches/linux-atm-2.4.1-gcc-4.patch
@@ -0,0 +1,161 @@
+diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-2.4.1/src/ilmid/atmf_uni.c
+--- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c  2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/ilmid/atmf_uni.c       2005-08-13 10:22:44.000000000 +0100
+@@ -187,7 +187,7 @@
+       newPrefix->name = alloc_t(AsnOid);
+       newPrefix->name->octs = alloc(varBindName->octetLen);
+       AsnOidCopy(newPrefix->name, varBindName);
+-      Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
++      Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix);
+       if(atmNetPrefix.octs == NULL)
+       {
+         atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
+@@ -197,7 +197,7 @@
+     }
+   else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
+     {
+-      Q_REMOVE((NetPrefixNode *) var->value, prefix);
++      Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix);
+     }
+ 
+   return NOERROR;
+diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-2.4.1/src/lib/sapequal.c
+--- linux-atm-2.4.1-orig/src/lib/sapequal.c    2001-09-03 19:41:05.000000000 +0100
++++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000 +0000
+@@ -65,6 +65,7 @@
+           CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window);
+           break;
+       default:
++          ;
+     }
+     switch (a.l3_proto) {
+       case ATM_L3_X25:
+@@ -83,6 +84,7 @@
+           if (a.l3.user != b.l3.user) return 0;
+           break;
+       default:
++          ;
+     }
+     return 1;
+ }
+diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-2.4.1/src/maint/atmtcp.c
+--- linux-atm-2.4.1-orig/src/maint/atmtcp.c    2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000 +0100
+@@ -60,7 +60,7 @@
+ static IN *inputs = NULL;
+ static fd_set in_set;
+ static int fds = 0;
+-static int debug = 0;
++int debug = 0;
+ static int links = 0;
+ 
+ 
+diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-2.4.1/src/maint/enitune.c
+--- linux-atm-2.4.1-orig/src/maint/enitune.c   2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/maint/enitune.c        2005-02-06 19:24:37.000000000 +0000
+@@ -44,6 +44,7 @@
+               if (*end || mult.rx <= 100) usage(name);
+               break;
+           default:
++          ;
+       }
+     if (argc != optind+1) usage(name);
+     sioc.number = strtol(argv[optind],&end,0);
+diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c
+--- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/mpoad/p_factory.c      2005-08-13 10:22:44.000000000 +0100
+@@ -31,16 +31,17 @@
+             *         beginning at location "addr".
+             */
+        uint32_t sum = 0;
++       uint16_t *addr16 = addr;
+ 
+         while( count > 1 )  {
+            /*  This is the inner loop */
+-               sum += * ((uint16_t *) addr)++;
++               sum += * addr16++;
+                count -= 2;
+        }
+ 
+            /*  Add left-over byte, if any */
+        if( count > 0 )
+-               sum += * (unsigned char *) addr;
++               sum += * (unsigned char *) addr16;
+ 
+            /*  Fold 32-bit sum to 16 bits */
+        while (sum>>16)
+diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-2.4.1/src/qgen/qlib.c
+--- linux-atm-2.4.1-orig/src/qgen/qlib.c       2001-09-03 19:41:05.000000000 +0100
++++ linux-atm-2.4.1/src/qgen/qlib.c    2005-08-13 10:22:44.000000000 +0100
+@@ -26,8 +26,6 @@
+ #include "op.h"
+ 
+ 
+-static int debug = 0;
+-
+ 
+ void PREFIX(report)(int severity,const char *msg,...)
+ {
+@@ -830,6 +828,8 @@
+ 
+ #ifdef STANDALONE
+ 
++int debug = 0;
++
+ int main(int argc,const char **argv)
+ {
+     unsigned char msg[5000]; /* should be large enough for that */
+diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-2.4.1/src/qgen/qlib.h
+--- linux-atm-2.4.1-orig/src/qgen/qlib.h       2001-09-03 19:41:05.000000000 +0100
++++ linux-atm-2.4.1/src/qgen/qlib.h    2005-08-13 10:22:44.000000000 +0100
+@@ -23,7 +23,6 @@
+ #define Q_FATAL               -1
+ 
+ 
+-extern int q_dump;
+ extern void q_report(int severity,const char *msg,...);
+ 
+ #ifdef DUMP_MODE
+diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-2.4.1/src/sigd/proto.c
+--- linux-atm-2.4.1-orig/src/sigd/proto.c      2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/sigd/proto.c   2005-02-06 19:24:37.000000000 +0000
+@@ -259,6 +259,7 @@
+               break;
+           }
+       default:
++          ;
+     }
+     va_end(ap);
+     if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size);
+@@ -288,6 +289,7 @@
+               }
+               break;
+           default:
++          ;
+       }
+       va_end(ap);
+     }
+diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-2.4.1/src/switch/debug/debug.c
+--- linux-atm-2.4.1-orig/src/switch/debug/debug.c      2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/switch/debug/debug.c   2005-08-13 10:22:44.000000000 +0100
+@@ -18,7 +18,7 @@
+ #define COMPONENT "FAB(debug)"
+ 
+ 
+-#define PRV(call) ((FAB *) (call)->fab)
++#define PRV(call) (*((FAB **) &(call)->fab))
+ 
+ 
+ typedef struct _fab {
+diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-2.4.1/src/switch/tcp/tcpsw.c
+--- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c        2001-09-03 19:41:06.000000000 +0100
++++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c     2005-08-13 10:22:44.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
+ #define COMPONENT "FAB(tcp)"
+ 
+-#define PRV(call) ((FAB *) (call)->fab)
++#define PRV(call) (*((FAB **) &(call)->fab))
+ 
+ #define MAX_VCI       1024
+