add missing config file and init script in the package

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

diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile
index 0d4bcea..55d7b0f 100644 (file)
--- a/openwrt/target/linux/linux-2.6/Makefile
+++ b/openwrt/target/linux/linux-2.6/Makefile
@@ -31,7 +31,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 := 1
 
 PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 PKG_RELEASE := 1
 

-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)" \


@@ -47,58 +47,135 @@ include $(LINUX_KCONFIG)
 INSTALL_TARGETS := $(KERNEL_IPKG)
 TARGETS := 
 
 INSTALL_TARGETS := $(KERNEL_IPKG)
 TARGETS := 
 

+ifeq ($(BOARD),x86)
+include ./x86.mk
+endif
+
+include ../netfilter.mk
+
+# Networking
+

 $(eval $(call KMOD_template,ATM,atm,\
        $(MODULES_DIR)/kernel/net/atm/atm.ko \
        $(MODULES_DIR)/kernel/net/atm/br2684.ko \
 ,CONFIG_ATM,,50,atm))
 $(eval $(call KMOD_template,ATM,atm,\
        $(MODULES_DIR)/kernel/net/atm/atm.ko \
        $(MODULES_DIR)/kernel/net/atm/br2684.ko \
 ,CONFIG_ATM,,50,atm))

-$(eval $(call KMOD_template,PPPOATM,pppoatm,\
-       $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
-,CONFIG_PPPOATM))
-$(eval $(call KMOD_template,ARPT,arptables,\
-       $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \
-,CONFIG_IP_NF_ARPTABLES))
-$(eval $(call KMOD_template,EBT,ebtables,\
-       $(MODULES_DIR)/kernel/net/bridge/netfilter/*.ko \
-,CONFIG_BRIDGE_NF_EBTABLES))
-$(eval $(call KMOD_template,IPTABLES_V4_EXTRA,iptables-extra,\
-       $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip*.ko \
+
+$(eval $(call KMOD_template,GRE,gre,\
+       $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \
+,CONFIG_NET_IPGRE))
+
+$(eval $(call KMOD_template,IMQ,imq,\
+       $(MODULES_DIR)/kernel/net/*/netfilter/*IMQ*.ko \
+       $(MODULES_DIR)/kernel/drivers/net/imq.ko \

 ))
 ))

-$(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\
-       $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.ko \
-,CONFIG_IP6_NF_IPTABLES,kmod-ipv6))
+

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

-$(eval $(call KMOD_template,IDE,ide,\
-       $(MODULES_DIR)/kernel/drivers/ide/*.ko \
-       $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \
-,CONFIG_IDE))
-$(eval $(call KMOD_template,LOOP,loop,\
-    $(MODULES_DIR)/kernel/drivers/block/loop.ko \
-,CONFIG_BLK_DEV_LOOP,,20,loop))
-$(eval $(call KMOD_template,CRYPTO,crypto,\
-       $(MODULES_DIR)/kernel/crypto/*.ko \
-))
+

 $(eval $(call KMOD_template,PPP,ppp,\
        $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \
        $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
        $(MODULES_DIR)/kernel/drivers/net/slhc.ko \
 ,CONFIG_PPP))
 $(eval $(call KMOD_template,PPP,ppp,\
        $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \
        $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
        $(MODULES_DIR)/kernel/drivers/net/slhc.ko \
 ,CONFIG_PPP))

+

 $(eval $(call KMOD_template,MPPE,mppe,\
        $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \
 ,CONFIG_PPP_MPPE_MPPC))
 $(eval $(call KMOD_template,MPPE,mppe,\
        $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \
 ,CONFIG_PPP_MPPE_MPPC))

+
+$(eval $(call KMOD_template,PPPOATM,pppoatm,\
+       $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
+,CONFIG_PPPOATM))
+

 $(eval $(call KMOD_template,PPPOE,pppoe,\
        $(MODULES_DIR)/kernel/drivers/net/pppoe.ko \
        $(MODULES_DIR)/kernel/drivers/net/pppox.ko \
 ,CONFIG_PPPOE))
 $(eval $(call KMOD_template,PPPOE,pppoe,\
        $(MODULES_DIR)/kernel/drivers/net/pppoe.ko \
        $(MODULES_DIR)/kernel/drivers/net/pppox.ko \
 ,CONFIG_PPPOE))

+
+$(eval $(call KMOD_template,SCHED,sched,\
+       $(MODULES_DIR)/kernel/net/sched/*.ko \
+))
+

 $(eval $(call KMOD_template,TUN,tun,\
        $(MODULES_DIR)/kernel/drivers/net/tun.ko \
 ,CONFIG_TUN,,20,tun))
 $(eval $(call KMOD_template,TUN,tun,\
        $(MODULES_DIR)/kernel/drivers/net/tun.ko \
 ,CONFIG_TUN,,20,tun))

-$(eval $(call KMOD_template,GRE,gre,\
-       $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \
-,CONFIG_NET_IPGRE))
-$(eval $(call KMOD_template,SCHED,sched,\
-       $(MODULES_DIR)/kernel/net/sched/*.ko \
+
+
+# Filtering / Firewalling
+
+$(eval $(call KMOD_template,ARPTABLES,arptables,\
+       $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \
+,CONFIG_IP_NF_ARPTABLES))
+
+$(eval $(call KMOD_template,EBTABLES,ebtables,\
+       $(MODULES_DIR)/kernel/net/bridge/netfilter/*.ko \
+,CONFIG_BRIDGE_NF_EBTABLES))
+
+# 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,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\
+       $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\
+       $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\
+       $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\
+       $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\
+       $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\
+       $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+,,,40,$(IPT_NAT_EXTRA-m)))
+
+$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\
+       $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\
+       $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).ko) \
+))
+
+$(eval $(call KMOD_template,IP6TABLES,ip6tables,\
+       $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.ko \
+,CONFIG_IP6_NF_IPTABLES,kmod-ipv6))
+
+
+# Block devices
+
+$(eval $(call KMOD_template,IDE,ide,\
+       $(MODULES_DIR)/kernel/drivers/ide/*.ko \
+       $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \
+,CONFIG_IDE))
+
+$(eval $(call KMOD_template,LOOP,loop,\
+    $(MODULES_DIR)/kernel/drivers/block/loop.ko \
+,CONFIG_BLK_DEV_LOOP,,20,loop))
+
+$(eval $(call KMOD_template,NBD,nbd,\
+    $(MODULES_DIR)/kernel/drivers/block/nbd.ko \
+,CONFIG_BLK_DEV_NBD,,20,nbd))
+
+
+# Crypto
+
+$(eval $(call KMOD_template,CRYPTO,crypto,\
+       $(MODULES_DIR)/kernel/crypto/*.ko \

 ))
 
 
 ))
 
 


@@ -109,22 +186,22 @@ $(eval $(call KMOD_template,FS_CIFS,fs-cifs,\
 ,CONFIG_CIFS,kmod-nls-base,30,cifs))
 
 $(eval $(call KMOD_template,FS_EXT2,fs-ext2,\
 ,CONFIG_CIFS,kmod-nls-base,30,cifs))
 
 $(eval $(call KMOD_template,FS_EXT2,fs-ext2,\

-       $(MODULES_DIR)/kernel/fs/ext2/*.ko \
+       $(MODULES_DIR)/kernel/fs/ext2/ext2.ko \

 ,CONFIG_EXT2_FS,,30,ext2))
 
 $(eval $(call KMOD_template,FS_EXT3,fs-ext3,\
 ,CONFIG_EXT2_FS,,30,ext2))
 
 $(eval $(call KMOD_template,FS_EXT3,fs-ext3,\

-       $(MODULES_DIR)/kernel/fs/ext3/*.ko \
-       $(MODULES_DIR)/kernel/fs/jbd/*.ko \
+       $(MODULES_DIR)/kernel/fs/ext3/ext3.ko \
+       $(MODULES_DIR)/kernel/fs/jbd/jbd.ko \

 ,CONFIG_EXT3_FS,,30,jbd ext3))
 
 $(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\
 ,CONFIG_EXT3_FS,,30,jbd ext3))
 
 $(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\

-       $(MODULES_DIR)/kernel/fs/hfsplus/*.ko \
+       $(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.ko \

 ,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus))
 
 $(eval $(call KMOD_template,FS_NFS,fs-nfs,\
 ,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus))
 
 $(eval $(call KMOD_template,FS_NFS,fs-nfs,\

-       $(MODULES_DIR)/kernel/fs/lockd/*.ko \
-       $(MODULES_DIR)/kernel/fs/nfs/*.ko \
-       $(MODULES_DIR)/kernel/net/sunrpc/*.ko \
+       $(MODULES_DIR)/kernel/fs/lockd/lockd.ko \
+       $(MODULES_DIR)/kernel/fs/nfs/nfs.ko \
+       $(MODULES_DIR)/kernel/net/sunrpc/sunrpc.ko \

 ,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
 
 $(eval $(call KMOD_template,FS_VFAT,fs-vfat,\
 ,CONFIG_NFS_FS,,30,sunrpc lockd nfs))
 
 $(eval $(call KMOD_template,FS_VFAT,fs-vfat,\


@@ -133,10 +210,27 @@ $(eval $(call KMOD_template,FS_VFAT,fs-vfat,\
 ,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat))
 
 $(eval $(call KMOD_template,FS_XFS,fs-xfs,\
 ,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat))
 
 $(eval $(call KMOD_template,FS_XFS,fs-xfs,\

-       $(MODULES_DIR)/kernel/fs/xfs/*.ko \
+       $(MODULES_DIR)/kernel/fs/xfs/xfs.ko \

 ,CONFIG_XFS_FS,,30,xfs))
 
 
 ,CONFIG_XFS_FS,,30,xfs))
 
 

+# Multimedia
+
+$(eval $(call KMOD_template,PWC,pwc,\
+       $(MODULES_DIR)/kernel/drivers/usb/media/pwc/pwc.ko \
+,CONFIG_USB_PWC,kmod-videodev,63,pwc))
+
+$(eval $(call KMOD_template,SOUNDCORE,soundcore,\
+       $(MODULES_DIR)/kernel/sound/soundcore.ko \
+,CONFIG_SOUND,,30,soundcore))
+
+$(eval $(call KMOD_template,VIDEODEV,videodev,\
+       $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat.ko \
+       $(MODULES_DIR)/kernel/drivers/media/video/v4l2-common.ko \
+       $(MODULES_DIR)/kernel/drivers/media/video/videodev.ko \
+,CONFIG_VIDEO_DEV,,62,videodev))
+
+

 # NLS
 
 $(eval $(call KMOD_template,NLS_BASE,nls-base,\
 # NLS
 
 $(eval $(call KMOD_template,NLS_BASE,nls-base,\


@@ -166,9 +260,60 @@ $(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\
 
 # Network devices
 
 
 # Network devices
 

+$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\
+       $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \
+,CONFIG_VORTEX,,10,3c59x))
+
+$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\
+       $(MODULES_DIR)/kernel/drivers/net/8139too.ko \
+,CONFIG_8139TOO,,10,8139too))
+
+$(eval $(call KMOD_template,NET_AIRO,net-airo,\
+       $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \
+,CONFIG_AIRO,,10,airo))
+

 $(eval $(call KMOD_template,NET_B44,net-b44,\
        $(MODULES_DIR)/kernel/drivers/net/b44.ko \
 $(eval $(call KMOD_template,NET_B44,net-b44,\
        $(MODULES_DIR)/kernel/drivers/net/b44.ko \

-,CONFIG_B44))
+,CONFIG_B44,,10,b44))
+
+$(eval $(call KMOD_template,NET_E100,net-e100,\
+       $(MODULES_DIR)/kernel/drivers/net/e100.ko \
+,CONFIG_E100,,10,e100))
+
+$(eval $(call KMOD_template,NET_HERMES,net-hermes,\
+       $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.ko \
+       $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.ko \
+,CONFIG_HERMES,,10,hermes orinoco))
+
+$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\
+       $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.ko \
+,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci))
+
+$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\
+       $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \
+,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx))
+
+$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\
+       $(MODULES_DIR)/kernel/drivers/net/natsemi.ko \
+,CONFIG_NATSEMI,,10,natsemi))
+
+$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
+       $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \
+,CONFIG_PRISM54,,10,prism54))
+
+
+# PCMCIA/CardBus
+
+$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\
+       $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.ko \
+       $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.ko \
+       $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.ko \
+       $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.ko \
+,CONFIG_PCMCIA,,50,pcmcia_core pcmcia yenta_socket rsrc_nonstatic))
+
+$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\
+       $(MODULES_DIR)/kernel/drivers/serial/serial_cs.ko \
+,CONFIG_SERIAL_8250_CS))

 
 
 # USB
 
 
 # USB


@@ -193,22 +338,54 @@ $(eval $(call KMOD_template,USB_ACM,usb-acm,\
        $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
 ,CONFIG_USB_ACM))
 
        $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \
 ,CONFIG_USB_ACM))
 

+$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\
+       $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \
+,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio))
+

 $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
        $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
 ,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp))
 
 $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
        $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \
 ,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp))
 

+$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
+       $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.ko \
+,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial))
+
+$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
+       $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.ko \
+,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa))
+
+$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\
+       $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.ko \
+,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.ko \
+,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232))
+
+$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
+       $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.ko \
+,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303))
+

 $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
 $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\

-       $(MODULES_DIR)/kernel/drivers/scsi/*.ko \
-       $(MODULES_DIR)/kernel/drivers/usb/storage/*.ko \
+       $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.ko \
+       $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.ko \
+       $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.ko \

 ,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
 
 
 ,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage))
 
 

-# Misc.
+# Misc. devices
+
+$(eval $(call KMOD_template,AX25,ax25,\
+       $(MODULES_DIR)/kernel/net/ax25/ax25.ko \
+       $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.ko \
+,CONFIG_AX25,,90,ax25 mkiss))

 
 $(eval $(call KMOD_template,BLUETOOTH,bluetooth,\
 
 $(eval $(call KMOD_template,BLUETOOTH,bluetooth,\

-       $(MODULES_DIR)/kernel/net/bluetooth/*.ko \
-       $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.ko \
-       $(MODULES_DIR)/kernel/drivers/bluetooth/*.ko \
+       $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.ko \
+       $(MODULES_DIR)/kernel/net/bluetooth/l2cap.ko \
+       $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \
+       $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \
+       $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \

 ,CONFIG_BLUEZ))
 
 
 ,CONFIG_BLUEZ))
 
 


@@ -256,28 +433,27 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
        tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
        tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
 
        tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
        tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
 

+$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
+       @mkdir -p $(STAMP_DIR)
+       @$(MAKE) $(TARGETS)
+       ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
+       @$(TRACE) target/linux/package
+       $(MAKE) -C $(TOPDIR)/target/linux/package \
+               $(KPKG_MAKEOPTS) \
+               compile
+       touch $@
+

 $(TARGET_MODULES_DIR): 
        -mkdir -p $(TARGET_MODULES_DIR)
 
 $(KERNEL_IPKG):
        rm -rf $(KERNEL_IDIR)
        mkdir -p $(KERNEL_IDIR)/etc
 $(TARGET_MODULES_DIR): 
        -mkdir -p $(TARGET_MODULES_DIR)
 
 $(KERNEL_IPKG):
        rm -rf $(KERNEL_IDIR)
        mkdir -p $(KERNEL_IDIR)/etc

-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(PKG_RELEASE) $(ARCH)
-       echo 'Package: kernel-$(LINUX_VERSION)-$(BOARD)' >> $(KERNEL_IDIR)/CONTROL/control
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH)

        if [ -f ./config/$(BOARD).modules ]; then \
                cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
        fi
        $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE)
        if [ -f ./config/$(BOARD).modules ]; then \
                cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
        fi
        $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE)

-       
-$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
-       @mkdir -p $(STAMP_DIR)
-       @$(MAKE) $(TARGETS)
-       ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
-       @$(TRACE) target/linux/package
-       $(MAKE) -C $(TOPDIR)/target/linux/package \
-               $(KPKG_MAKEOPTS) \
-               compile
-       touch $@

 
 source: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured
 
 source: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured


@@ -291,20 +467,21 @@ install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                install
        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                install

-       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true; } $(MAKE_TRACE)
+       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true; } $(MAKE_TRACE) 

 
 mostlyclean:
 
 mostlyclean:

+       rm -f $(STAMP_DIR)/.linux-compile

        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked

-       $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
+       $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean $(MAKE_TRACE)

        rm -f $(LINUX_KERNEL) $(LINUX_IMAGE)
 
 rebuild:
        -$(MAKE) mostlyclean
        if [ -f $(LINUX_KERNEL) ]; then \
        rm -f $(LINUX_KERNEL) $(LINUX_IMAGE)
 
 rebuild:
        -$(MAKE) mostlyclean
        if [ -f $(LINUX_KERNEL) ]; then \

-               $(MAKE) clean; \
+               $(MAKE) clean $(MAKE_TRACE); \

        fi
        fi

-       $(MAKE) compile
+       $(MAKE) compile $(MAKE_TRACE)

 
 clean:
        rm -f $(STAMP_DIR)/.linux-compile
 
 clean:
        rm -f $(STAMP_DIR)/.linux-compile