Hi David: The last patch that I sent you regarding IPv6 Makefiles in 2.4 is broken. It always makes ipv6.o as a module even when it is meant to be compiled in. Here is a better one which organises things similar to how it is done in 2.5. Cheers, -- Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ ) Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Index: kernel-source-2.4/net/Makefile =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/net/Makefile,v retrieving revision 1.1.1.13.2.2 diff -u -r1.1.1.13.2.2 Makefile --- kernel-source-2.4/net/Makefile 11 Oct 2003 04:57:21 -0000 1.1.1.13.2.2 +++ kernel-source-2.4/net/Makefile 17 Oct 2003 11:58:25 -0000 @@ -7,11 +7,11 @@ O_TARGET := network.o -mod-subdirs := ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched core xfrm +mod-subdirs := ipv4/netfilter ipv6 ipx irda bluetooth atm netlink sched core xfrm export-objs := netsyms.o subdir-y := core ethernet -subdir-m := ipv4 ipv6 xfrm # hum? +subdir-m := ipv4 xfrm # hum? subdir-$(CONFIG_NET) += 802 sched netlink @@ -20,12 +20,6 @@ subdir-$(CONFIG_UNIX) += unix subdir-$(CONFIG_IPV6) += ipv6 -ifneq ($(CONFIG_IPV6),n) -ifneq ($(CONFIG_IPV6),) -subdir-$(CONFIG_NETFILTER) += ipv6/netfilter -endif -endif - subdir-$(CONFIG_KHTTPD) += khttpd subdir-$(CONFIG_PACKET) += packet subdir-$(CONFIG_NET_KEY) += key Index: kernel-source-2.4/net/ipv6/Makefile =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/net/ipv6/Makefile,v retrieving revision 1.1.1.10.2.1 diff -u -r1.1.1.10.2.1 Makefile --- kernel-source-2.4/net/ipv6/Makefile 30 Aug 2003 12:30:47 -0000 1.1.1.10.2.1 +++ kernel-source-2.4/net/ipv6/Makefile 17 Oct 2003 11:58:16 -0000 @@ -7,19 +7,20 @@ # -O_TARGET := ipv6.o - export-objs := ipv6_syms.o -obj-y := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \ +mod-subdirs := netfilter + +obj-$(CONFIG_IPV6) += ipv6.o + +ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \ route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \ protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \ exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \ ip6_flowlabel.o ipv6_syms.o -obj-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o - -obj-m := $(O_TARGET) +ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o +ipv6-objs += $(ipv6-y) obj-$(CONFIG_INET6_AH) += ah6.o obj-$(CONFIG_INET6_ESP) += esp6.o @@ -27,4 +28,9 @@ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o +subdir-$(CONFIG_NETFILTER) += netfilter + include $(TOPDIR)/Rules.make + +ipv6.o: $(ipv6-objs) + $(LD) -r -o $@ $(ipv6-objs)
