Re: Linux 2.4.0test1-ac10

From: Rusty Russell (rusty@linuxcare.com.au)
Date: Mon Jun 12 2000 - 19:59:56 EST


In message <8hk10h$d3s$1@enterprise.cistron.net> you write:
> In article <cistron.E12zNUR-0007uY-00@the-village.bc.nu>,
> Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> >2.4.0-test1-ac10
> >o netfilter: struct memcmp bogosity fix (Russell King + Rusty)
> [lots 'o fixes]
>
> However, ipchains compatibility doesn't work:

It doesn't get linked in; the solution is to change network.a to
network.o.

This compiles: does it boot & fix problem?

diff -urN -X /tmp/filen8STT9 --minimal tmp/Makefile working-2.4.0-test1/Makefile
--- tmp/Makefile Thu May 25 01:29:47 2000
+++ working-2.4.0-test1/Makefile Wed Jun 7 16:37:51 2000
@@ -118,7 +118,7 @@
 #export RAMDISK = -DRAMDISK=512
 
 CORE_FILES =kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
-NETWORKS =net/network.a
+NETWORKS =net/network.o
 DRIVERS =drivers/block/block.a \
                  drivers/char/char.o \
                  drivers/misc/misc.o \
diff -urN -X /tmp/filen8STT9 --minimal tmp/net/Makefile working-2.4.0-test1/net/Makefile
--- tmp/net/Makefile Thu May 25 12:41:52 2000
+++ working-2.4.0-test1/net/Makefile Wed Jun 7 16:44:43 2000
@@ -7,6 +7,7 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
+O_TARGET := network.o
 MOD_SUB_DIRS := ipv4
 ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
                 netrom rose lapb x25 wanrouter netlink sched packet sunrpc \
@@ -195,27 +196,17 @@
   endif
 endif
 
-# We must attach netsyms.o to socket.o, as otherwise there is nothing
-# to pull the object file from the archive.
+O_OBJS := socket.o protocols.o $(join $(SUB_DIRS), $(patsubst %,/%.o,$(notdir $(SUB_DIRS))))
 
-SOCK := socket.o
 ifeq ($(CONFIG_NET),y)
 ifeq ($(CONFIG_MODULES),y)
-O_TARGET := sock_n_syms.o
-O_OBJS := socket.o
-OX_OBJS := netsyms.o
-SOCK := $(O_TARGET)
+OX_OBJS += netsyms.o
 endif
 endif
 
-L_TARGET := network.a
-L_OBJS := $(SOCK) protocols.o $(join $(SUB_DIRS), $(patsubst %,/%.o,$(notdir $(SUB_DIRS))))
-
-M_OBJS :=
-
 ifeq ($(CONFIG_SYSCTL),y)
 ifeq ($(CONFIG_NET),y)
-L_OBJS += sysctl_net.o
+O_OBJS += sysctl_net.o
 endif
 endif
 

--
Hacking time.

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jun 15 2000 - 21:00:27 EST