diff options
| -rw-r--r-- | include/netfilter.mk | 7 | ||||
| -rw-r--r-- | package/kernel/modules/crypto.mk | 6 | ||||
| -rw-r--r-- | package/kernel/modules/fs.mk | 3 | ||||
| -rw-r--r-- | package/kernel/modules/netdevices.mk | 2 | ||||
| -rw-r--r-- | package/kernel/modules/video.mk | 4 |
5 files changed, 17 insertions, 5 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk index 29dbbc4..1cbb9a8 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -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_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_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_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length)) $(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)) 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 $(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))) diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index c8be6f9..5459de3 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -369,7 +369,6 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/cast6.ko \ $(LINUX_DIR)/crypto/fcrypt.ko \ $(LINUX_DIR)/crypto/khazad.ko \ - $(LINUX_DIR)/crypto/serpent.ko \ $(LINUX_DIR)/crypto/sha256_generic.ko \ $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ @@ -388,6 +387,11 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/blowfish_common.ko \ $(LINUX_DIR)/crypto/blowfish_generic.ko 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) endef diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 913042a..22f9ec5 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -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 KCONFIG:=\ CONFIG_BTRFS_FS \ - CONFIG_BTRFS_FS_POSIX_ACL=n + CONFIG_BTRFS_FS_POSIX_ACL=n \ + CONFIG_BTRFS_FS_CHECK_INTEGRITY=n FILES:=\ $(LINUX_DIR)/fs/btrfs/btrfs.ko AUTOLOAD:=$(call AutoLoad,30,btrfs,1) diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 787cfa2..ac9795b 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -130,7 +130,7 @@ $(eval $(call KernelPackage,swconfig)) define KernelPackage/mvswitch SUBMENU:=$(NETWORK_DEVICES_MENU) 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 FILES:=$(LINUX_DIR)/drivers/net/phy/mvswitch.ko AUTOLOAD:=$(call AutoLoad,41,mvswitch) diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 7a6eb31..05e249a 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -18,7 +18,9 @@ define KernelPackage/video-core CONFIG_VIDEO_V4L1=y \ CONFIG_VIDEO_ALLOW_V4L1=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) FILES:= \ $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \ |