ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-18 16:40:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

kernel: modules: fs: adapt for kernel 6.1

Browse Source 
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>
This commit is contained in:
Robert Marko 2022-10-26 13:27:51 +02:00 committed by Christian Marangi
parent 4a02c5954f
commit 6dce5a7b58
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/linux/modules/fs.mk
View File

@ -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

3
package/kernel/linux/modules/netsupport.mk
View File

@ -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