kernel: modules: don't override NLS dependencies

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

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 77d8d6c98bc8bb606a67f834fe57624be4610a26..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
+  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 \
@@ -83,21 +83,42 @@ endef
 $(eval $(call KernelPackage,fs-btrfs))
 
 
+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
+  FILES:= \
+       $(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
+ Kernel module dependency for CIFS or SMB_SERVER support
+endef
+
+$(eval $(call KernelPackage,fs-smbfs-common))
+
+
 define KernelPackage/fs-cifs
   SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
   KCONFIG:= \
-       CONFIG_SMBFS_COMMON \
        CONFIG_CIFS \
        CONFIG_CIFS_DFS_UPCALL=n \
        CONFIG_CIFS_UPCALL=n
   FILES:= \
-       $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \
-       $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko \
-       $(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+= \
+    +kmod-fs-smbfs-common \
     +kmod-crypto-md5 \
     +kmod-crypto-sha256 \
     +kmod-crypto-sha512 \
@@ -254,7 +275,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
@@ -321,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
 
@@ -330,6 +354,44 @@ endef
 
 $(eval $(call KernelPackage,fs-jfs))
 
+
+define KernelPackage/fs-ksmbd
+  SUBMENU:=$(FS_MENU)
+  TITLE:=SMB kernel server support
+  DEPENDS:= \
+         +kmod-nls-base \
+         +kmod-nls-utf8 \
+         +kmod-crypto-md5 \
+         +kmod-crypto-hmac \
+         +kmod-crypto-ecb \
+         +kmod-crypto-des \
+         +kmod-crypto-sha256 \
+         +kmod-crypto-cmac \
+         +kmod-crypto-sha512 \
+         +kmod-crypto-aead \
+         +kmod-crypto-ccm \
+         +kmod-crypto-gcm \
+         +kmod-asn1-decoder \
+         +kmod-oid-registry \
+         +kmod-fs-smbfs-common
+  KCONFIG:= \
+       CONFIG_SMB_SERVER \
+       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@lt6.1 \
+        $(LINUX_DIR)/fs/smb/server/ksmbd.ko@ge6.1
+  AUTOLOAD:=$(call AutoLoad,41,ksmbd)
+endef
+
+define KernelPackage/fs-ksmbd/description
+ Kernel module for SMB kernel server support
+endef
+
+$(eval $(call KernelPackage,fs-ksmbd))
+
+
 define KernelPackage/fs-minix
   SUBMENU:=$(FS_MENU)
   TITLE:=Minix filesystem support
@@ -410,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
 
@@ -652,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