fix small trx_check bug in mtd

[openwrt.git] / openwrt / target / linux / linux-2.4 / Makefile

diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index 4fb33d6..5a16a7e 100644 (file)
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -22,7 +22,7 @@ IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CO
 PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 PKG_RELEASE := 2
 
 PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 PKG_RELEASE := 2
 

-KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel-$(LINUX_VERSION)-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk
+KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk

 KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
 KPKG_MAKEOPTS:=        IPKG="$(IPKG_KERNEL)" \
 KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
 KPKG_MAKEOPTS:=        IPKG="$(IPKG_KERNEL)" \


@@ -50,6 +50,7 @@ ifeq ($(BOARD),ar7)
 include ./ar7.mk
 endif
 
 include ./ar7.mk
 endif
 

+include ../netfilter.mk

 
 # Networking
 
 
 # Networking
 


@@ -62,6 +63,11 @@ $(eval $(call KMOD_template,GRE,gre,\
        $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \
 ,CONFIG_NET_IPGRE))
 
        $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \
 ,CONFIG_NET_IPGRE))
 

+$(eval $(call KMOD_template,IMQ,imq,\
+       $(MODULES_DIR)/kernel/net/*/netfilter/*IMQ*.o \
+       $(MODULES_DIR)/kernel/drivers/net/imq.o \
+))
+

 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
 ,CONFIG_IPV6,,20,ipv6))
 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
 ,CONFIG_IPV6,,20,ipv6))


@@ -107,11 +113,47 @@ $(eval $(call KMOD_template,EBTABLES,ebtables,\
        $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \
 ,CONFIG_BRIDGE_NF_EBTABLES))
 
        $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \
 ,CONFIG_BRIDGE_NF_EBTABLES))
 

-$(eval $(call KMOD_template,IPTABLES_V4_EXTRA,iptables-extra,\
-       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip*.o \
+# metapackage for compatibility ...
+$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\
+,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd))
+
+$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\
+       $(foreach mod,$(IPKG_KMOD_IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\
+       $(foreach mod,$(IPKG_KMOD_IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\
+       $(foreach mod,$(IPKG_KMOD_IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\
+       $(foreach mod,$(IPKG_KMOD_IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\
+       $(foreach mod,$(IPKG_KMOD_IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\
+       $(foreach mod,$(IPKG_KMOD_IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\
+       $(foreach mod,$(IPKG_KMOD_IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+,,,40,$(IPKG_KMOD_IPT_NAT_EXTRA-m)))
+
+$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\
+       $(foreach mod,$(IPKG_KMOD_IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+))
+
+$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\
+       $(foreach mod,$(IPKG_KMOD_IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \

 ))
 
 ))
 

-$(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\
+$(eval $(call KMOD_template,IP6TABLES,ip6tables,\

        $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \
 ,CONFIG_IP6_NF_IPTABLES,kmod-ipv6))
 
        $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \
 ,CONFIG_IP6_NF_IPTABLES,kmod-ipv6))
 


@@ -201,7 +243,7 @@ $(eval $(call KMOD_template,NET_3C59X,net-3c59x,\
 $(eval $(call KMOD_template,NET_8139TOO,net-8139too,\
        $(MODULES_DIR)/kernel/drivers/net/8139too.o \
        $(MODULES_DIR)/kernel/drivers/net/mii.o \
 $(eval $(call KMOD_template,NET_8139TOO,net-8139too,\
        $(MODULES_DIR)/kernel/drivers/net/8139too.o \
        $(MODULES_DIR)/kernel/drivers/net/mii.o \

-,CONFIG_VORTEX,,10,mii 8139too))
+,CONFIG_8139TOO,,10,mii 8139too))

 
 $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \
 
 $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \


@@ -211,6 +253,10 @@ $(eval $(call KMOD_template,NET_B44,net-b44,\
        $(MODULES_DIR)/kernel/drivers/net/b44.o \
 ,CONFIG_B44,,10,b44))
 
        $(MODULES_DIR)/kernel/drivers/net/b44.o \
 ,CONFIG_B44,,10,b44))
 

+$(eval $(call KMOD_template,NET_E100,net-e100,\
+       $(MODULES_DIR)/kernel/drivers/net/e100.o \
+,CONFIG_E100,,10,e100))
+

 $(eval $(call KMOD_template,NET_HERMES,net-hermes,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \
        $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \
 $(eval $(call KMOD_template,NET_HERMES,net-hermes,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \
        $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \


@@ -233,20 +279,29 @@ $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
 ,CONFIG_PRISM54,,10,prism54))
 
 
 ,CONFIG_PRISM54,,10,prism54))
 
 

+# PCMCIA/CardBus
+
+$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\
+       $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.o \
+       $(MODULES_DIR)/kernel/drivers/pcmcia/ds.o \
+       $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.o \
+,CONFIG_PCMCIA,,50,pcmcia_core))
+
+

 # USB
 
 $(eval $(call KMOD_template,USB,usb-core,\
        $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \
 ,CONFIG_USB,,50,usbcore))
 
 # USB
 
 $(eval $(call KMOD_template,USB,usb-core,\
        $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \
 ,CONFIG_USB,,50,usbcore))
 

-$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
-       $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
-,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
-

 $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
        $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
 ,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci))
 
 $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
        $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
 ,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci))
 

+$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
+       $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
+,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci))
+

 $(eval $(call KMOD_template,USB2,usb2,\
        $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
 ,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))
 $(eval $(call KMOD_template,USB2,usb2,\
        $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
 ,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd))


@@ -273,7 +328,7 @@ $(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
 
 $(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
        $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \
 
 $(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
        $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \

-,CONFIG_USB_SERIAL_IR,kmod-usb-serial,61,ftdi_usb))
+,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio))

 
 $(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
        $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \
 
 $(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
        $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \