fix menuconfig on fedora x86_64

[openwrt.git] / openwrt / package / linux / Makefile

diff --git a/openwrt/package/linux/Makefile b/openwrt/package/linux/Makefile
index 5c74d39..14e3ac4 100644 (file)
--- a/openwrt/package/linux/Makefile
+++ b/openwrt/package/linux/Makefile
@@ -1,8 +1,8 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include ./linux.mk
-include ./linux.config
+include ./linux-2.4/linux.mk
+include ./linux-2.4/linux.config
 
 PKG_BUILD_DIR := $(BUILD_DIR)/linux-modules
 PKG_RELEASE := 1
@@ -10,6 +10,7 @@ PKG_RELEASE := 1
 TARGETS := 
 INSTALL_TARGETS := 
 
+.NOTPARALLEL:
 
 define KMOD_template
 ifeq ($$(strip $(4)),)
@@ -38,54 +39,116 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
 
 endef
 
+$(eval $(call KMOD_template,DIAG,diag,\
+       $(MODULES_DIR)/kernel/drivers/net/diag/diag.o \
+))
+$(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
+       $(MODULES_DIR)/kernel/drivers/net/wl/wl.o \
+,CONFIG_WL))
+$(eval $(call KMOD_template,B44,b44,\
+       $(MODULES_DIR)/kernel/drivers/net/b44.o \
+,CONFIG_B44))
+$(eval $(call KMOD_template,BRCM_ET,brcm-et,\
+       $(MODULES_DIR)/kernel/drivers/net/et/et.o \
+,CONFIG_ET))
 $(eval $(call KMOD_template,ARPT,arptables,\
        $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \
 ,CONFIG_IP_NF_ARPTABLES))
 $(eval $(call KMOD_template,EBT,ebtables,\
        $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \
 ,CONFIG_BRIDGE_NF_EBTABLES))
-$(eval $(call KMOD_template,IPT4,iptables-extra,\
+$(eval $(call KMOD_template,IPTABLES_V4,iptables,\
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_state.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_nat_ftp.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_conntrack.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_conntrack_ftp.o \
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_MASQUERADE.o \
+))
+$(eval $(call KMOD_template,IPTABLES_V4_EXTRA,iptables-extra,\
        $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip*.o \
 ))
-$(eval $(call KMOD_template,IPT6,ip6tables,\
+$(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\
        $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \
 ,CONFIG_IP6_NF_IPTABLES))
 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
 ,CONFIG_IPV6))
-$(eval $(call KMOD_template,SMBFS,smbfs,\
-       $(MODULES_DIR)/kernel/fs/smbfs/smbfs.o \
-,CONFIG_SMB_FS))
+$(eval $(call KMOD_template,CIFS,cifs,\
+       $(MODULES_DIR)/kernel/fs/cifs/cifs.o \
+,CONFIG_CIFS))
 $(eval $(call KMOD_template,NFS,nfs,\
        $(MODULES_DIR)/kernel/fs/lockd/*.o \
        $(MODULES_DIR)/kernel/fs/nfs/*.o \
        $(MODULES_DIR)/kernel/net/sunrpc/*.o \
 ,CONFIG_NFS_FS))
-$(eval $(call KMOD_template,USB,usb,\
-       $(MODULES_DIR)/kernel/drivers/scsi/*.o \
-       $(MODULES_DIR)/kernel/drivers/usb/*.o \
-       $(MODULES_DIR)/kernel/drivers/usb/*/*.o \
+$(eval $(call KMOD_template,USB,usb-core,\
+       $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \
 ,CONFIG_USB))
+$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
+       $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
+,CONFIG_USB_UHCI_ALT))
+$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
+       $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
+,CONFIG_USB_OHCI))
+$(eval $(call KMOD_template,USB2,usb2,\
+       $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
+,CONFIG_USB_EHCI_HCD))
+$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
+       $(MODULES_DIR)/kernel/drivers/scsi/*.o \
+       $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \
+,CONFIG_USB_STORAGE))
+$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
+       $(MODULES_DIR)/kernel/drivers/usb/printer.o \
+,CONFIG_USB_PRINTER))
+$(eval $(call KMOD_template,LOOP,loop,\
+       $(MODULES_DIR)/kernel/drivers/block/loop.o \
+,CONFIG_BLK_DEV_LOOP))
+$(eval $(call KMOD_template,NBD,nbd,\
+       $(MODULES_DIR)/kernel/drivers/block/nbd.o \
+,CONFIG_BLK_DEV_NBD))
 $(eval $(call KMOD_template,LP,lp,\
        $(MODULES_DIR)/kernel/drivers/parport/parport.o \
        $(MODULES_DIR)/kernel/drivers/parport/parport_splink.o \
        $(MODULES_DIR)/kernel/drivers/char/lp.o \
 ,CONFIG_PARPORT))
+$(eval $(call KMOD_template,IDE,ide,\
+       $(MODULES_DIR)/kernel/drivers/ide/*.o \
+       $(MODULES_DIR)/kernel/drivers/ide/*/*.o \
+,CONFIG_IDE))
+$(eval $(call KMOD_template,EXT2,ext2,\
+       $(MODULES_DIR)/kernel/fs/ext2/*.o \
+,CONFIG_EXT2_FS))
+$(eval $(call KMOD_template,EXT3,ext3,\
+       $(MODULES_DIR)/kernel/fs/ext3/*.o \
+       $(MODULES_DIR)/kernel/fs/jbd/*.o \
+,CONFIG_EXT3_FS))
+$(eval $(call KMOD_template,XFS,xfs,\
+       $(MODULES_DIR)/kernel/fs/xfs/*.o \
+,CONFIG_XFS_FS))
+$(eval $(call KMOD_template,HFSPLUS,hfsplus,\
+       $(MODULES_DIR)/kernel/fs/hfsplus/*.o \
+,CONFIG_HFSPLUS_FS))
 $(eval $(call KMOD_template,VFAT,vfat,\
        $(MODULES_DIR)/kernel/fs/vfat/vfat.o \
        $(MODULES_DIR)/kernel/fs/fat/fat.o \
-       $(MODULES_DIR)/kernel/fs/msdos/msdos.o \
 ,CONFIG_VFAT_FS))
 $(eval $(call KMOD_template,CRYPTO,crypto,\
        $(MODULES_DIR)/kernel/crypto/*.o \
 ))
 $(eval $(call KMOD_template,PPP,ppp,\
+       $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \
        $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
        $(MODULES_DIR)/kernel/drivers/net/slhc.o \
 ,CONFIG_PPP))
 $(eval $(call KMOD_template,MPPE,mppe,\
        $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \
 ,CONFIG_PPP_MPPE_MPPC))
+$(eval $(call KMOD_template,PPPOE,pppoe,\
+       $(MODULES_DIR)/kernel/drivers/net/pppoe.o \
+       $(MODULES_DIR)/kernel/drivers/net/pppox.o \
+,CONFIG_PPPOE))
 $(eval $(call KMOD_template,TUN,tun,\
        $(MODULES_DIR)/kernel/drivers/net/tun.o \
 ,CONFIG_TUN))