projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce9b21b
)
kernel: remove obsolete dependencies and conditionals
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 17 May 2012 15:28:17 +0000
(15:28 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Thu, 17 May 2012 15:28:17 +0000
(15:28 +0000)
SVN-Revision: 31779
package/kernel/modules/crypto.mk
patch
|
blob
|
history
package/kernel/modules/fs.mk
patch
|
blob
|
history
package/kernel/modules/lib.mk
patch
|
blob
|
history
package/kernel/modules/other.mk
patch
|
blob
|
history
package/kernel/modules/usb.mk
patch
|
blob
|
history
package/kernel/modules/video.mk
patch
|
blob
|
history
diff --git
a/package/kernel/modules/crypto.mk
b/package/kernel/modules/crypto.mk
index 3c1528e984e86066dd9ebe464c0bd8468c56961d..bb612fcf6c71c65e76af59344d3d4c59f332a041 100644
(file)
--- a/
package/kernel/modules/crypto.mk
+++ b/
package/kernel/modules/crypto.mk
@@
-64,7
+64,7
@@
$(eval $(call KernelPackage,crypto-manager))
define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface
define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface
- DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
@!LINUX_2_6_37
+ DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
KCONFIG:= \
CONFIG_CRYPTO_USER_API \
CONFIG_CRYPTO_USER_API_HASH \
KCONFIG:= \
CONFIG_CRYPTO_USER_API \
CONFIG_CRYPTO_USER_API_HASH \
diff --git
a/package/kernel/modules/fs.mk
b/package/kernel/modules/fs.mk
index cd6db90ef6d11270ed5b419bc3de6b5cb1ec0ac9..9226ad90312d3377adbce0c88c46b498a9050cae 100644
(file)
--- a/
package/kernel/modules/fs.mk
+++ b/
package/kernel/modules/fs.mk
@@
-25,7
+25,7
@@
$(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
- DEPENDS:=+kmod-lib-crc32c +
!(LINUX_2_6_37):
kmod-lib-lzo +kmod-lib-zlib
+ DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib
KCONFIG:=\
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \
KCONFIG:=\
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \
@@
-56,9
+56,9
@@
define KernelPackage/fs-cifs
+kmod-crypto-arc4 \
+kmod-crypto-hmac \
+kmod-crypto-md5 \
+kmod-crypto-arc4 \
+kmod-crypto-hmac \
+kmod-crypto-md5 \
- +
!(LINUX_2_6_37):
kmod-crypto-md4 \
- +
!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39):
kmod-crypto-des \
- +
!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39):
kmod-crypto-ecb
+ +kmod-crypto-md4 \
+ +kmod-crypto-des \
+ +kmod-crypto-ecb
endef
define KernelPackage/fs-cifs/description
endef
define KernelPackage/fs-cifs/description
diff --git
a/package/kernel/modules/lib.mk
b/package/kernel/modules/lib.mk
index cf21d49fdba7e5d3fe247eb8d477d70e008fdac5..6029f793029b0218e3d6eb946e04ba52d67b7979 100644
(file)
--- a/
package/kernel/modules/lib.mk
+++ b/
package/kernel/modules/lib.mk
@@
-55,7
+55,7
@@
$(eval $(call KernelPackage,lib-crc7))
define KernelPackage/lib-crc8
SUBMENU:=$(LIB_MENU)
TITLE:=CRC8 support
define KernelPackage/lib-crc8
SUBMENU:=$(LIB_MENU)
TITLE:=CRC8 support
- DEPENDS:= @!
(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0)
+ DEPENDS:= @!
LINUX_2_6_39
KCONFIG:=CONFIG_CRC8
FILES:=$(LINUX_DIR)/lib/crc8.ko
AUTOLOAD:=$(call AutoLoad,20,crc8)
KCONFIG:=CONFIG_CRC8
FILES:=$(LINUX_DIR)/lib/crc8.ko
AUTOLOAD:=$(call AutoLoad,20,crc8)
@@
-150,7
+150,7
@@
$(eval $(call KernelPackage,lib-zlib))
define KernelPackage/lib-cordic
SUBMENU:=$(LIB_MENU)
TITLE:=Cordic function support
define KernelPackage/lib-cordic
SUBMENU:=$(LIB_MENU)
TITLE:=Cordic function support
- DEPENDS:= @!
(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0)
+ DEPENDS:= @!
LINUX_2_6_39
KCONFIG:=CONFIG_CORDIC
FILES:=$(LINUX_DIR)/lib/cordic.ko
AUTOLOAD:=$(call AutoLoad,20,cordic)
KCONFIG:=CONFIG_CORDIC
FILES:=$(LINUX_DIR)/lib/cordic.ko
AUTOLOAD:=$(call AutoLoad,20,cordic)
diff --git
a/package/kernel/modules/other.mk
b/package/kernel/modules/other.mk
index ea0e91ffee491ac8a71bfdba2c3194c9736deb67..be762533f688bc719f3333c612aa9d172ef5c0ff 100644
(file)
--- a/
package/kernel/modules/other.mk
+++ b/
package/kernel/modules/other.mk
@@
-825,7
+825,7
@@
$(eval $(call KernelPackage,mtdtests))
define KernelPackage/nand
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND flash support
define KernelPackage/nand
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND flash support
- DEPENDS:=@!
(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39)
+ DEPENDS:=@!
LINUX_2_6_39
KCONFIG:=CONFIG_MTD_NAND \
CONFIG_MTD_NAND_IDS \
CONFIG_MTD_NAND_ECC
KCONFIG:=CONFIG_MTD_NAND \
CONFIG_MTD_NAND_IDS \
CONFIG_MTD_NAND_ECC
@@
-846,7
+846,7
@@
$(eval $(call KernelPackage,nand))
define KernelPackage/nandsim
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND simulator
define KernelPackage/nandsim
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND simulator
- DEPENDS:=
@!(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39)
+kmod-nand
+ DEPENDS:=+kmod-nand
KCONFIG:=CONFIG_MTD_NAND_NANDSIM
FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko
endef
KCONFIG:=CONFIG_MTD_NAND_NANDSIM
FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko
endef
diff --git
a/package/kernel/modules/usb.mk
b/package/kernel/modules/usb.mk
index 7f27a20aecbab5469233c535155e0a2162d973fb..893d7b2a3f60d2d57fd0c9b1f7f10c1815e575af 100644
(file)
--- a/
package/kernel/modules/usb.mk
+++ b/
package/kernel/modules/usb.mk
@@
-561,7
+561,6
@@
$(eval $(call KernelPackage,usb-serial-keyspan))
define KernelPackage/usb-serial-wwan
TITLE:=Support for GSM and CDMA modems
define KernelPackage/usb-serial-wwan
TITLE:=Support for GSM and CDMA modems
- DEPENDS:= @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32
KCONFIG:=CONFIG_USB_SERIAL_WWAN
FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
KCONFIG:=CONFIG_USB_SERIAL_WWAN
FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
@@
-577,7
+576,7
@@
$(eval $(call KernelPackage,usb-serial-wwan))
define KernelPackage/usb-serial-option
TITLE:=Support for Option HSDPA modems
define KernelPackage/usb-serial-option
TITLE:=Support for Option HSDPA modems
- DEPENDS:=+
!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32:
kmod-usb-serial-wwan
+ DEPENDS:=+kmod-usb-serial-wwan
KCONFIG:=CONFIG_USB_SERIAL_OPTION
FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
AUTOLOAD:=$(call AutoLoad,65,option)
KCONFIG:=CONFIG_USB_SERIAL_OPTION
FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
AUTOLOAD:=$(call AutoLoad,65,option)
diff --git
a/package/kernel/modules/video.mk
b/package/kernel/modules/video.mk
index 5ff55c9014b3b1f40092aca10e7776bad4f27b7f..d5063e8250783134499e489f26d9d2531fcf66cd 100644
(file)
--- a/
package/kernel/modules/video.mk
+++ b/
package/kernel/modules/video.mk
@@
-43,7
+43,6
@@
endef
define KernelPackage/video-videobuf2
TITLE:=videobuf2 lib
define KernelPackage/video-videobuf2
TITLE:=videobuf2 lib
- DEPENDS:= @!(LINUX_2_6_37||LINUX_2_6_38)
KCONFIG:= \
CONFIG_VIDEOBUF2_CORE \
CONFIG_VIDEOBUF2_MEMOPS \
KCONFIG:= \
CONFIG_VIDEOBUF2_CORE \
CONFIG_VIDEOBUF2_MEMOPS \
@@
-99,7
+98,7
@@
$(eval $(call KernelPackage,video-sn9c102))
define KernelPackage/video-pwc
TITLE:=Philips USB webcam support
define KernelPackage/video-pwc
TITLE:=Philips USB webcam support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +!
(LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0)
:kmod-video-videobuf2
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!
LINUX_2_6_39
:kmod-video-videobuf2
KCONFIG:= \
CONFIG_USB_PWC \
CONFIG_USB_PWC_DEBUG=n
KCONFIG:= \
CONFIG_USB_PWC \
CONFIG_USB_PWC_DEBUG=n
@@
-117,7
+116,7
@@
$(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_3
7||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
||LINUX_3_1||LINUX_3_2):kmod-video-videobuf2
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!(LINUX_2_6_3
9
||LINUX_3_1||LINUX_3_2):kmod-video-videobuf2
KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo)