KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package/kernel: introduce a new file that will be sourced first and holding complex dependencies spread over multiple files, use it for kmod-crc16

Browse source 
SVN-Revision: 21101
This commit is contained in:
Nicolas Thill 2010-04-23 04:01:03 +00:00
parent 3b9e0000ec
commit 5034b75865
4 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package/kernel/modules/001-depends.mk Normal file
View file

@ -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

3
package/kernel/modules/fs.mk
View file

@ -120,11 +120,12 @@ define KernelPackage/fs-ext4
CONFIG_EXT4_FS_SECURITY=y \ CONFIG_EXT4_FS_SECURITY=y \
CONFIG_EXT4_FS \ CONFIG_EXT4_FS \
CONFIG_JBD2 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:= \ FILES:= \
$(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
$(call AddDepends/crc16)
endef endef
define KernelPackage/fs-ext4/description define KernelPackage/fs-ext4/description

2
package/kernel/modules/netsupport.mk
View file

@ -601,7 +601,6 @@ $(eval $(call KernelPackage,sched))
define KernelPackage/ax25 define KernelPackage/ax25
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=AX25 support TITLE:=AX25 support
DEPENDS:= +kmod-crc16
KCONFIG:= \ KCONFIG:= \
CONFIG_AX25 \ CONFIG_AX25 \
CONFIG_MKISS CONFIG_MKISS
@ -609,6 +608,7 @@ define KernelPackage/ax25
$(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss) AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
$(call AddDepends/crc16)
endef endef
define KernelPackage/ax25/description define KernelPackage/ax25/description

4
package/kernel/modules/other.mk
View file

@ -65,6 +65,7 @@ define KernelPackage/crc16
KCONFIG:=CONFIG_CRC16 KCONFIG:=CONFIG_CRC16
FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,crc16,1) AUTOLOAD:=$(call AutoLoad,20,crc16,1)
$(call SetDepends/crc16)
endef endef
define KernelPackage/crc16/description define KernelPackage/crc16/description
@ -261,7 +262,7 @@ $(eval $(call KernelPackage,ssb))
define KernelPackage/bluetooth define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support 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 +(TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx):kmod-rfkill
KCONFIG:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
@ -281,6 +282,7 @@ define KernelPackage/bluetooth
CONFIG_BT_HCIUSB \ CONFIG_BT_HCIUSB \
CONFIG_BT_HCIUART \ CONFIG_BT_HCIUART \
CONFIG_BT_HIDP CONFIG_BT_HIDP
$(call AddDepends/crc16)
endef endef
define KernelPackage/bluetooth/2.4 define KernelPackage/bluetooth/2.4