package/kernel: introduce a new file that will be sourced first and holding complex...
authorNicolas Thill <nico@openwrt.org>
Fri, 23 Apr 2010 04:01:03 +0000 (04:01 +0000)
committerNicolas Thill <nico@openwrt.org>
Fri, 23 Apr 2010 04:01:03 +0000 (04:01 +0000)
SVN-Revision: 21101

package/kernel/modules/001-depends.mk [new file with mode: 0644]
package/kernel/modules/fs.mk
package/kernel/modules/netsupport.mk
package/kernel/modules/other.mk

diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk
new file mode 100644 (file)
index 0000000..2446d3e
--- /dev/null
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# XXX: xburst has CONFIG_CRC16=y because of CONFIG_UBIFS_FS=y
+
+define SetDepends/crc16
+  DEPENDS:= @!TARGET_xburst
+endef
+
+define AddDepends/crc16
+  DEPENDS+= +!TARGET_xburst:kmod-crc16
+endef
index f497292d2bd147c12fa9947c7c1f6bc353b47117..49193e66ce4956899f9ef299bd444bb4301cdd0d 100644 (file)
@@ -120,11 +120,12 @@ define KernelPackage/fs-ext4
        CONFIG_EXT4_FS_SECURITY=y \
        CONFIG_EXT4_FS \
        CONFIG_JBD2
-  DEPENDS:= @LINUX_2_6 +kmod-crc16 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  DEPENDS:= @LINUX_2_6 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:= \
        $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
+  $(call AddDepends/crc16)
 endef
 
 define KernelPackage/fs-ext4/description
index 0c0c912448cc552486055870fd37ebcf9dbb67da..de044789eb55138133067fb2a5b626db65f8175b 100644 (file)
@@ -601,7 +601,6 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
-  DEPENDS:= +kmod-crc16
   KCONFIG:= \
        CONFIG_AX25 \
        CONFIG_MKISS
@@ -609,6 +608,7 @@ define KernelPackage/ax25
        $(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
+  $(call AddDepends/crc16)
 endef
 
 define KernelPackage/ax25/description
index 97ce3d3b70f535301fdc99dd48a41be180993208..d00b6f78a6472cf4beed979a785e27405566589f 100644 (file)
@@ -65,6 +65,7 @@ define KernelPackage/crc16
   KCONFIG:=CONFIG_CRC16
   FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,crc16,1)
+  $(call SetDepends/crc16)
 endef
 
 define KernelPackage/crc16/description
@@ -261,7 +262,7 @@ $(eval $(call KernelPackage,ssb))
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT +kmod-crc16 +kmod-usb-core +!TARGET_x86:kmod-hid \
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid \
        +(TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx):kmod-rfkill
   KCONFIG:= \
        CONFIG_BLUEZ \
@@ -281,6 +282,7 @@ define KernelPackage/bluetooth
        CONFIG_BT_HCIUSB \
        CONFIG_BT_HCIUART \
        CONFIG_BT_HIDP
+  $(call AddDepends/crc16)
 endef
 
 define KernelPackage/bluetooth/2.4