add some fixes for parallel build (does not work with -j4 yet, but it gets most packa...

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

diff --git a/openwrt/package/linux/Makefile b/openwrt/package/linux/Makefile
index 6ed9837..3f73035 100644 (file)
--- a/openwrt/package/linux/Makefile
+++ b/openwrt/package/linux/Makefile
@@ -10,6 +10,7 @@ PKG_RELEASE := 1
 TARGETS := 
 INSTALL_TARGETS := 
 
 TARGETS := 
 INSTALL_TARGETS := 
 

+.NOTPARALLEL:

 
 define KMOD_template
 ifeq ($$(strip $(4)),)
 
 define KMOD_template
 ifeq ($$(strip $(4)),)


@@ -38,6 +39,12 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
 
 endef
 
 
 endef
 

+$(eval $(call KMOD_template,BRCM_WL,brcm-wl,\
+       $(MODULES_DIR)/kernel/drivers/net/wl/wl.o \
+,CONFIG_WL))
+$(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,ARPT,arptables,\
        $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \
 ,CONFIG_IP_NF_ARPTABLES))


@@ -53,21 +60,36 @@ $(eval $(call KMOD_template,IPT6,ip6tables,\
 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
 ,CONFIG_IPV6))
 $(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,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))
 ,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,LP,lp,\
        $(MODULES_DIR)/kernel/drivers/parport/parport.o \
 $(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,VFAT,vfat,\
        $(MODULES_DIR)/kernel/drivers/char/lp.o \
 ,CONFIG_PARPORT))
 $(eval $(call KMOD_template,VFAT,vfat,\


@@ -79,12 +101,17 @@ $(eval $(call KMOD_template,CRYPTO,crypto,\
        $(MODULES_DIR)/kernel/crypto/*.o \
 ))
 $(eval $(call KMOD_template,PPP,ppp,\
        $(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))
        $(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))
 $(eval $(call KMOD_template,TUN,tun,\
        $(MODULES_DIR)/kernel/drivers/net/tun.o \
 ,CONFIG_TUN))