From: Weijie Gao Date: Sat, 6 Jan 2024 07:56:26 +0000 (+0800) Subject: kernel: modules: fs: adapt for kernel 6.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f9198480da262d379dc1604e2c5338a213aef6d0;p=openwrt%2Fstaging%2Fldir.git kernel: modules: fs: adapt for kernel 6.6 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 --- diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 58af180c28..8f1ed41484 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 +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,6 +87,7 @@ define KernelPackage/fs-smbfs-common SUBMENU:=$(FS_MENU) TITLE:=SMBFS common dependencies support HIDDEN:=1 + DEPENDS:=+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils KCONFIG:=\ CONFIG_SMBFS_COMMON@lt6.1 \ CONFIG_SMBFS@ge6.1 @@ -344,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 @@ -470,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 @@ -712,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 diff --git a/package/kernel/linux/modules/nls.mk b/package/kernel/linux/modules/nls.mk index 7450ed1ce5..893ec9c23a 100644 --- a/package/kernel/linux/modules/nls.mk +++ b/package/kernel/linux/modules/nls.mk @@ -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))