From f09fb1ac120d104613745b03edbeb06926a78fdb Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Fri, 22 Nov 2024 21:05:17 +0800
Subject: [PATCH] ksmbd: move to in tree kernel buidin module

---
 package/kernel/ksmbd/Makefile                 | 51 -------------------
 .../ksmbd/patches/01-keep_kmod_metadata.patch | 11 ----
 .../02-fix-build-with-kernel-6.12.patch       | 15 ------
 package/kernel/linux/modules/fs.mk            | 36 +++++++++++++
 4 files changed, 36 insertions(+), 77 deletions(-)
 delete mode 100644 package/kernel/ksmbd/Makefile
 delete mode 100644 package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch
 delete mode 100644 package/kernel/ksmbd/patches/02-fix-build-with-kernel-6.12.patch

diff --git a/package/kernel/ksmbd/Makefile b/package/kernel/ksmbd/Makefile
deleted file mode 100644
index 33fb4e478..000000000
--- a/package/kernel/ksmbd/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ksmbd
-PKG_VERSION:=2024.10.14
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/namjaejeon/ksmbd.git
-PKG_SOURCE_VERSION:=0ee56e8d7da200ba5ddaa63d71fc6903919e6f99
-PKG_MIRROR_HASH:=7b244dcc78515be0d2dd4a4d2b6ec27582d8addc34654ce4ff74db4d17760aca
-
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/fs-ksmbd
-	SUBMENU:=Filesystems
-	TITLE:=SMB kernel server support
-	URL:=https://github.com/cifsd-team/cifsd
-	FILES:=$(PKG_BUILD_DIR)/ksmbd.ko
-	DEPENDS:= \
-		+kmod-nls-base \
-		+kmod-nls-utf8 \
-		+kmod-crypto-md4 \
-		+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
-endef
-
-
-# The last two DEPENDS are hacks in order to get CONFIG_ASN1 and CONFIG_OID_REGISTRY
-# which it seems can't be selected independently. Some bug in either base or upstream.
-
-define Build/Compile
-	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \
-	CONFIG_SMB_SERVER=m \
-	modules
-endef
-
-$(eval $(call KernelPackage,fs-ksmbd))
diff --git a/package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch b/package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch
deleted file mode 100644
index b2c6687d0..000000000
--- a/package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/glob.h
-+++ b/glob.h
-@@ -7,6 +7,8 @@
- #ifndef __KSMBD_GLOB_H
- #define __KSMBD_GLOB_H
- 
-+#undef CONFIG_MODULE_STRIPPED
-+
- #include <linux/ctype.h>
- 
- #include "unicode.h"
diff --git a/package/kernel/ksmbd/patches/02-fix-build-with-kernel-6.12.patch b/package/kernel/ksmbd/patches/02-fix-build-with-kernel-6.12.patch
deleted file mode 100644
index 42ef122fa..000000000
--- a/package/kernel/ksmbd/patches/02-fix-build-with-kernel-6.12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/unicode.c
-+++ b/unicode.c
-@@ -8,7 +8,12 @@
-  */
- #include <linux/fs.h>
- #include <linux/slab.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
- #include <asm/unaligned.h>
-+#else
-+#include <linux/unaligned.h>
-+#endif
- #include "glob.h"
- #include "unicode.h"
- #include "uniupr.h"
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 8f7cfe74b..a04c736c0 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -359,6 +359,42 @@ 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/smb/server/ksmbd.ko
+  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