From 9ae1212282428ed7db58bbfb50455b88f3e41889 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 8 Feb 2014 15:34:12 +0000 Subject: [PATCH] kernel: negate kernel version dependencies to fix config for new kernel versions This fixes some problems on kernel 3.13 and also removes the reference to LINUX_3_7. Signed-off-by: Hauke Mehrtens SVN-Revision: 39532 --- package/kernel/linux/modules/fs.mk | 2 +- package/kernel/linux/modules/netdevices.mk | 2 +- package/kernel/linux/modules/usb.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 561638394b..cd27e4aa6b 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -25,7 +25,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +(LINUX_3_9||LINUX_3_10||LINUX_3_12):kmod-lib-raid6 +(LINUX_3_9||LINUX_3_10||LINUX_3_12):kmod-lib-xor + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-raid6 +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-xor KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n \ diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 5bb1416a83..3dcbe11ed6 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -430,7 +430,7 @@ $(eval $(call KernelPackage,e1000)) define KernelPackage/e1000e SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) PRO/1000 PCIe cards kernel support - DEPENDS:=@PCIE_SUPPORT +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_7):kmod-ptp + DEPENDS:=@PCIE_SUPPORT +(!LINUX_3_3&&!LINUX_3_6):kmod-ptp KCONFIG:=CONFIG_E1000E FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko AUTOLOAD:=$(call AutoProbe,e1000e) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 825b29e3cb..407ca53394 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -205,7 +205,7 @@ $(eval $(call KernelPackage,usb2-pci)) define KernelPackage/usb-dwc2 TITLE:=DWC2 USB controller driver - DEPENDS:=@LINUX_3_10 + DEPENDS:=@(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8&&!LINUX_3_9) KCONFIG:= \ CONFIG_USB_DWC2 \ CONFIG_USB_DWC2_DEBUG=n \ -- 2.30.2