From 0ab7c18f48845a7e53bc8e2e799808449980e4b8 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 4 Dec 2024 13:55:27 +0800 Subject: [PATCH] ksmbd: update to Git HEAD (2024-12-02) --- package/kernel/ksmbd/Makefile | 4 ++-- .../patches/02-fix-build-with-kernel-6.12.patch | 15 --------------- .../ksmbd/patches/02-linux-is_dot_dotdot.patch | 11 +++++++++++ 3 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 package/kernel/ksmbd/patches/02-fix-build-with-kernel-6.12.patch create mode 100644 package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch diff --git a/package/kernel/ksmbd/Makefile b/package/kernel/ksmbd/Makefile index 33fb4e478..74b68b458 100644 --- a/package/kernel/ksmbd/Makefile +++ b/package/kernel/ksmbd/Makefile @@ -6,8 +6,8 @@ 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_SOURCE_VERSION:=6a0efcd1301d72ccd76b2f457c1d0b56702f4908 +PKG_MIRROR_HASH:=02ba5828aae66d4fac202b8c4dcb1f45beb255655927741eb293d4a257822624 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING 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 - #include -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include "glob.h" - #include "unicode.h" - #include "uniupr.h" diff --git a/package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch b/package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch new file mode 100644 index 000000000..338cb250f --- /dev/null +++ b/package/kernel/ksmbd/patches/02-linux-is_dot_dotdot.patch @@ -0,0 +1,11 @@ +--- a/vfs.c ++++ b/vfs.c +@@ -2662,7 +2662,7 @@ + } + #endif + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 60) + static inline bool is_dot_dotdot(const char *name, size_t len) + { + return len && unlikely(name[0] == '.') &&