kernel: modules: don't override NLS dependencies

[openwrt/openwrt.git] / package / kernel / linux / modules / fs.mk

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 5fb9a2b7d64f518aec6b1fe31be9a4a6d4fae5f0..0d98c5a6815166f3e0dbc868348b1465636eaaa2 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 +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.1 \
+       CONFIG_SMBFS@ge6.1
   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.1 \
+       $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.1 \
+       $(LINUX_DIR)/fs/smb/common/cifs_arc4.ko@ge6.1 \
+       $(LINUX_DIR)/fs/smb/common/cifs_md4.ko@ge6.1
 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.1 \
+       $(LINUX_DIR)/fs/smb/client/cifs.ko@ge6.1
   AUTOLOAD:=$(call AutoLoad,30,cifs)
   $(call AddDepends/nls)
   DEPENDS+= \
@@ -338,6 +344,7 @@ define KernelPackage/fs-jfs
   KCONFIG:=CONFIG_JFS_FS
   FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
   AUTOLOAD:=$(call AutoLoad,30,jfs,1)
+  DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
   $(call AddDepends/nls)
 endef
 
@@ -354,8 +361,7 @@ define KernelPackage/fs-ksmbd
   DEPENDS:= \
          +kmod-nls-base \
          +kmod-nls-utf8 \
-         +kmod-crypto-md4 \
-          +kmod-crypto-md5 \
+         +kmod-crypto-md5 \
          +kmod-crypto-hmac \
          +kmod-crypto-ecb \
          +kmod-crypto-des \
@@ -373,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.1 \
+        $(LINUX_DIR)/fs/smb/server/ksmbd.ko@ge6.1
   AUTOLOAD:=$(call AutoLoad,41,ksmbd)
 endef
 
@@ -464,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
 
@@ -706,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