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

kernel: update module names and add new config symbols for linux 3.3

Browse source 
SVN-Revision: 29985
This commit is contained in:
Jonas Gorski 2012-02-02 08:23:44 +00:00
parent 3310df6b52
commit c336de3d85
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/netfilter.mk
View file

@ -116,7 +116,6 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_DSCP, $(P_V4)ipt_DSCP))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP))
$(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit)) $(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_ECN, $(P_V4)ipt_ecn))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_LENGTH, $(P_V4)ipt_length)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_LENGTH, $(P_V4)ipt_length))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_MARK, $(P_V4)ipt_mark)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_MARK, $(P_V4)ipt_mark))
@ -144,6 +143,12 @@ else
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK))
endif endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3)),1)
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_ECN, $(P_XT)xt_ecn))
else
$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_ECN, $(P_V4)ipt_ecn))
endif
# userland only # userland only
$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_tos))) $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_tos)))
$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_TOS))) $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_TOS)))

6
package/kernel/modules/crypto.mk
View file

@ -369,7 +369,6 @@ define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/cast6.ko \ $(LINUX_DIR)/crypto/cast6.ko \
$(LINUX_DIR)/crypto/fcrypt.ko \ $(LINUX_DIR)/crypto/fcrypt.ko \
$(LINUX_DIR)/crypto/khazad.ko \ $(LINUX_DIR)/crypto/khazad.ko \
$(LINUX_DIR)/crypto/serpent.ko \
$(LINUX_DIR)/crypto/sha256_generic.ko \ $(LINUX_DIR)/crypto/sha256_generic.ko \
$(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/sha512_generic.ko \
$(LINUX_DIR)/crypto/tea.ko \ $(LINUX_DIR)/crypto/tea.ko \
@ -388,6 +387,11 @@ define KernelPackage/crypto-misc
$(LINUX_DIR)/crypto/blowfish_common.ko \ $(LINUX_DIR)/crypto/blowfish_common.ko \
$(LINUX_DIR)/crypto/blowfish_generic.ko $(LINUX_DIR)/crypto/blowfish_generic.ko
endif endif
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,3.2)),1)
FILES += $(LINUX_DIR)/crypto/serpent.ko
else
FILES += $(LINUX_DIR)/crypto/serpent_generic.ko
endif
$(call AddDepends/crypto) $(call AddDepends/crypto)
endef endef

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

@ -28,7 +28,8 @@ define KernelPackage/fs-btrfs
DEPENDS:=+kmod-lib-crc32c +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36||LINUX_2_6_37):kmod-lib-lzo +kmod-lib-zlib DEPENDS:=+kmod-lib-crc32c +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36||LINUX_2_6_37):kmod-lib-lzo +kmod-lib-zlib
KCONFIG:=\ KCONFIG:=\
CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n CONFIG_BTRFS_FS_POSIX_ACL=n \
CONFIG_BTRFS_FS_CHECK_INTEGRITY=n
FILES:=\ FILES:=\
$(LINUX_DIR)/fs/btrfs/btrfs.ko $(LINUX_DIR)/fs/btrfs/btrfs.ko
AUTOLOAD:=$(call AutoLoad,30,btrfs,1) AUTOLOAD:=$(call AutoLoad,30,btrfs,1)

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

@ -130,7 +130,7 @@ $(eval $(call KernelPackage,swconfig))
define KernelPackage/mvswitch define KernelPackage/mvswitch
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Marvell 88E6060 switch support TITLE:=Marvell 88E6060 switch support
DEPENDS:=+kmod-swconfig @!LINUX_3_1&&!LINUX_3_2||BROKEN DEPENDS:=+kmod-swconfig @!LINUX_3_1&&!LINUX_3_2&&!LINUX_3_3||BROKEN
KCONFIG:=CONFIG_MVSWITCH_PHY KCONFIG:=CONFIG_MVSWITCH_PHY
FILES:=$(LINUX_DIR)/drivers/net/phy/mvswitch.ko FILES:=$(LINUX_DIR)/drivers/net/phy/mvswitch.ko
AUTOLOAD:=$(call AutoLoad,41,mvswitch) AUTOLOAD:=$(call AutoLoad,41,mvswitch)

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

@ -18,7 +18,9 @@ define KernelPackage/video-core
CONFIG_VIDEO_V4L1=y \ CONFIG_VIDEO_V4L1=y \
CONFIG_VIDEO_ALLOW_V4L1=y \ CONFIG_VIDEO_ALLOW_V4L1=y \
CONFIG_VIDEO_CAPTURE_DRIVERS=y \ CONFIG_VIDEO_CAPTURE_DRIVERS=y \
CONFIG_V4L_USB_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y \
CONFIG_V4L_PCI_DRIVERS=y \
CONFIG_V4L_PLATFORM_DRIVERS=y
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.38)),1)
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/media/video/v4l2-common.ko \ $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \