From 3c1b417e8f076fe95658685bd5b617d584baf4a0 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 7 Jan 2022 10:40:30 +0800 Subject: [PATCH] Revert "kmod-fs-nfs: adjust depends again" This reverts commit d9316c5814b1f487ebd9ed4df1d2b4263b79f720. --- package/kernel/linux/modules/fs.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index e9135036b..1760874b9 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -398,7 +398,7 @@ $(eval $(call KernelPackage,fs-nfs)) define KernelPackage/fs-nfs-ssc SUBMENU:=$(FS_MENU) TITLE:=Common NFS filesystem SSC Helper module - KCONFIG:= CONFIG_NFS_V4_2@ge5.15 + KCONFIG:= CONFIG_NFS_V4_2@ge5.10 FILES:= $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@ge5.10 AUTOLOAD:=$(call AutoLoad,30,nfs_ssc) endef @@ -409,7 +409,7 @@ $(eval $(call KernelPackage,fs-nfs-ssc)) define KernelPackage/fs-nfs-common SUBMENU:=$(FS_MENU) TITLE:=Common NFS filesystem modules - DEPENDS:=+LINUX_5_15:kmod-fs-nfs-ssc + DEPENDS:=+!LINUX_5_4:kmod-fs-nfs-ssc KCONFIG:= \ CONFIG_LOCKD \ CONFIG_SUNRPC \ @@ -417,8 +417,7 @@ define KernelPackage/fs-nfs-common FILES:= \ $(LINUX_DIR)/fs/lockd/lockd.ko \ $(LINUX_DIR)/net/sunrpc/sunrpc.ko \ - $(LINUX_DIR)/fs/nfs_common/grace.ko \ - $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@ge5.10 + $(LINUX_DIR)/fs/nfs_common/grace.ko AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd) endef @@ -474,7 +473,7 @@ $(eval $(call KernelPackage,fs-nfs-v3)) define KernelPackage/fs-nfs-v4 SUBMENU:=$(FS_MENU) TITLE:=NFS4 filesystem client support - DEPENDS:=+kmod-fs-nfs +LINUX_5_15:kmod-fs-nfs-ssc + DEPENDS:=+kmod-fs-nfs +!LINUX_5_4:kmod-fs-nfs-ssc KCONFIG:= \ CONFIG_NFS_V4=y FILES:= \