diff options
| author | Robert Marko <robimarko@gmail.com> | 2022-10-26 13:27:51 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-22 22:28:20 +0200 |
| commit | 6dce5a7b58b023153a87f282311ae7fb6b895472 (patch) | |
| tree | 4e95bb1a1145030f28e9a0d91bcd217e68705a98 /package/kernel/linux | |
| parent | 4a02c5954f10291cf046f9bbf727fa01ce04a235 (diff) | |
| download | upstream-6dce5a7b58b023153a87f282311ae7fb6b895472.tar.gz upstream-6dce5a7b58b023153a87f282311ae7fb6b895472.tar.bz2 upstream-6dce5a7b58b023153a87f282311ae7fb6b895472.zip | |
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>
Diffstat (limited to 'package/kernel/linux')
| -rw-r--r-- | package/kernel/linux/modules/fs.mk | 6 | ||||
| -rw-r--r-- | package/kernel/linux/modules/netsupport.mk | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 1dddebfed73..5fb9a2b7d64 100644 --- 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 8ef99069d37..dcc2799c79a 100644 --- 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 |