prpl/prplos
2
0
Fork 0
mirror of https://gitlab.com/prpl-foundation/prplos/prplos.git synced 2025-12-20 00:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

kernel: modules: fs: adapt for kernel 6.6

Browse Source 
Adapt fs kmods for building under kernel 6.6:
* Add kmod-fs-netfs as dependency for kmod-fs-9p
* Add kmod-fs-netfs as dependency for fs-smbfs-common as netfs is
required for cifs since 6.3
* Add new kmod-nls-ucs2-utils as dependency for smbfs/jfs as UCS2
support was split as new module since 6.6.
* Add kmod-lib-zlib-deflate and kmod-lib-zlib-inflate as
dependencies for kmod-pstore due to crypto API compression was
replaced with zlib_deflate library calls since 6.6
* Remove nfs_ssc.ko from kmod-fs-nfs-common. The nfs_ssc was no
longer a kernel module described by NFS_V4_2_SSC_HELPER since 5.13 [1]

Link:
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/fs/Kconfig?id=d9092b4bb2109502eb8972021a3f74febc931a63

Signed-off-by: Weijie Gao <hackpascal@gmail.com>
(cherry picked from commit f9198480da)
[ adapt for changes after 6.1.36 ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Weijie Gao
2024-01-06 15:56:26 +08:00
committed by Matthias Franck
parent 040efaea7f
commit 049f714317
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
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 +LINUX_6_1:kmod-fs-netfs
DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6:kmod-fs-netfs
KCONFIG:=\
CONFIG_9P_FS \
CONFIG_9P_FS_POSIX_ACL=n \
@@ -87,10 +87,15 @@ define KernelPackage/fs-smbfs-common
SUBMENU:=$(FS_MENU)
TITLE:=SMBFS common dependencies support
HIDDEN:=1
KCONFIG:=CONFIG_SMBFS_COMMON
DEPENDS:=+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils
KCONFIG:=\
CONFIG_SMBFS_COMMON@lt6.6 \
CONFIG_SMBFS@ge6.6
FILES:= \
$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \
$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko
$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@lt6.6 \
$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.6 \
$(LINUX_DIR)/fs/smb/common/cifs_arc4.ko@ge6.6 \
$(LINUX_DIR)/fs/smb/common/cifs_md4.ko@ge6.6
endef
define KernelPackage/fs-smbfs-common/description
@@ -108,7 +113,8 @@ define KernelPackage/fs-cifs
CONFIG_CIFS_DFS_UPCALL=n \
CONFIG_CIFS_UPCALL=n
FILES:= \
$(LINUX_DIR)/fs/cifs/cifs.ko
$(LINUX_DIR)/fs/cifs/cifs.ko@lt6.6 \
$(LINUX_DIR)/fs/smb/client/cifs.ko@ge6.6
AUTOLOAD:=$(call AutoLoad,30,cifs)
$(call AddDepends/nls)
DEPENDS+= \
@@ -339,6 +345,7 @@ define KernelPackage/fs-jfs
FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
AUTOLOAD:=$(call AutoLoad,30,jfs,1)
$(call AddDepends/nls)
DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
endef
define KernelPackage/fs-jfs/description
@@ -372,7 +379,9 @@ define KernelPackage/fs-ksmbd
CONFIG_SMB_SERVER_SMBDIRECT=n \
CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \
CONFIG_SMB_SERVER_KERBEROS5=n
FILES:=$(LINUX_DIR)/fs/ksmbd/ksmbd.ko
FILES:= \
$(LINUX_DIR)/fs/ksmbd/ksmbd.ko@lt6.6 \
$(LINUX_DIR)/fs/smb/server/ksmbd.ko@ge6.6
AUTOLOAD:=$(call AutoLoad,41,ksmbd)
endef
@@ -463,8 +472,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
$(LINUX_DIR)/fs/nfs_common/grace.ko
AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
endef
@@ -705,6 +713,7 @@ define KernelPackage/pstore
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
AUTOLOAD:=$(call AutoLoad,30,pstore,1)
DEPENDS:=+LINUX_6_6:kmod-lib-zlib-deflate +LINUX_6_6:kmod-lib-zlib-inflate
endef
define KernelPackage/pstore/description

17
package/kernel/linux/modules/nls.mk
View File

@@ -339,3 +339,20 @@ define KernelPackage/nls-utf8/description
endef
$(eval $(call KernelPackage,nls-utf8))
define KernelPackage/nls-ucs2-utils
SUBMENU:=Native Language Support
TITLE:=UCS-2 common library
DEPENDS+=@LINUX_6_6
HIDDEN:=1
KCONFIG:=CONFIG_NLS_UCS2_UTILS
FILES:=$(LINUX_DIR)/fs/nls/nls_ucs2_utils.ko
$(call AddDepends/nls)
endef
define KernelPackage/nls-ucs2-utils/description
UCS-2 common library
endef
$(eval $(call KernelPackage,nls-ucs2-utils))