kernel: modules: fs: adapt for kernel 6.1

Adapt filesystem kmods for building under kernel 6.1:
* Depend on kernel not being 5.10 rather than only 5.15
* kmod-fs-9p depends on kmod-fs-netfs from 5.17 as they started using
netfs helpers
* Set new KConfig options to N

Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 1dddebfed736986363149ba81d6fd3c6c45d91d3..5fb9a2b7d64f518aec6b1fe31be9a4a6d4fae5f0 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -10,7 +10,7 @@ FS_MENU:=Filesystems
 define KernelPackage/fs-9p
   SUBMENU:=$(FS_MENU)
   TITLE:=Plan 9 Resource Sharing Support
-  DEPENDS:=+kmod-9pnet
+  DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs
   KCONFIG:=\
        CONFIG_9P_FS \
        CONFIG_9P_FS_POSIX_ACL=n \
@@ -269,7 +269,9 @@ define KernelPackage/fs-fscache
        CONFIG_FSCACHE_OBJECT_LIST=n \
        CONFIG_CACHEFILES \
        CONFIG_CACHEFILES_DEBUG=n \
-       CONFIG_CACHEFILES_HISTOGRAM=n
+       CONFIG_CACHEFILES_HISTOGRAM=n \
+       CONFIG_CACHEFILES_ERROR_INJECTION=n@ge5.17 \
+       CONFIG_CACHEFILES_ONDEMAND=n@ge5.19
   FILES:= \
        $(LINUX_DIR)/fs/fscache/fscache.ko \
        $(LINUX_DIR)/fs/cachefiles/cachefiles.ko

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 8ef99069d37704292b30bac08dd376e15ef7ac53..dcc2799c79afe5e5ef0fb0a288977ad536f11158 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1316,7 +1316,8 @@ define KernelPackage/9pnet
        CONFIG_NET_9P \
        CONFIG_NET_9P_DEBUG=n \
        CONFIG_NET_9P_XEN=n \
-       CONFIG_NET_9P_VIRTIO
+       CONFIG_NET_9P_VIRTIO \
+       CONFIG_NET_9P_FD=n@ge5.17
   FILES:= \
        $(LINUX_DIR)/net/9p/9pnet.ko \
        $(LINUX_DIR)/net/9p/9pnet_virtio.ko