From 4c05596690a8b412303fc39705fceb17d755f3c4 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Thu, 16 Apr 2020 00:19:36 +0800
Subject: [PATCH] kernel/fs: use native exFAT driver for Kernel 5.4+

---
 package/kernel/linux/modules/fs.mk | 40 +++++++++++++++---------------
 package/lean/automount/Makefile    |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index d9d15f4d4e..3906bf34d8 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -163,28 +163,28 @@ endef
 $(eval $(call KernelPackage,fs-efivarfs))
 
 
-#define KernelPackage/fs-exfat
-#  SUBMENU:=$(FS_MENU)
-#  TITLE:=exFAT filesystem support
-#  KCONFIG:= \
-#	CONFIG_EXFAT_FS \
-#	CONFIG_EXFAT_DONT_MOUNT_VFAT=y \
-#	CONFIG_EXFAT_DISCARD=y \
-#	CONFIG_EXFAT_DELAYED_SYNC=n \
-#	CONFIG_EXFAT_KERNEL_DEBUG=n \
-#	CONFIG_EXFAT_DEBUG_MSG=n \
-#	CONFIG_EXFAT_DEFAULT_CODEPAGE=437 \
-#	CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-#  FILES:=$(LINUX_DIR)/drivers/staging/exfat/exfat.ko
-#  AUTOLOAD:=$(call AutoLoad,30,exfat,1)
-#  DEPENDS:=@!(LINUX_4_9||LINUX_4_14||LINUX_4_19) +kmod-nls-base
-#endef
+define KernelPackage/fs-exfat-kernel
+  SUBMENU:=$(FS_MENU)
+  TITLE:=exFAT filesystem support
+  KCONFIG:= \
+	CONFIG_EXFAT_FS \
+	CONFIG_EXFAT_DONT_MOUNT_VFAT=y \
+	CONFIG_EXFAT_DISCARD=y \
+	CONFIG_EXFAT_DELAYED_SYNC=n \
+	CONFIG_EXFAT_KERNEL_DEBUG=n \
+	CONFIG_EXFAT_DEBUG_MSG=n \
+	CONFIG_EXFAT_DEFAULT_CODEPAGE=437 \
+	CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+  FILES:=$(LINUX_DIR)/drivers/staging/exfat/exfat.ko
+  AUTOLOAD:=$(call AutoLoad,30,exfat,1)
+  DEPENDS:=@!(LINUX_4_9||LINUX_4_14||LINUX_4_19) +kmod-nls-base
+endef
 
-#define KernelPackage/fs-exfat/description
-# Kernel module for exFAT filesystem support
-#endef
+define KernelPackage/fs-exfat-kernel/description
+ Kernel module for exFAT filesystem support
+endef
 
-#$(eval $(call KernelPackage,fs-exfat))
+$(eval $(call KernelPackage,fs-exfat-kernel))
 
 
 define KernelPackage/fs-exportfs
diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile
index 53d7ac56e2..3059ba9d0f 100644
--- a/package/lean/automount/Makefile
+++ b/package/lean/automount/Makefile
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/automount
   TITLE:=Mount autoconfig hotplug script.
   MAINTAINER:=Lean
-  DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas +kmod-fs-vfat +kmod-fs-ext4 +kmod-fs-exfat +ntfs-3g
+  DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas +kmod-fs-vfat +kmod-fs-ext4 +ntfs-3g +@(LINUX_4_9||LINUX_4_14||LINUX_4_19):kmod-fs-exfat +@LINUX_5_4:kmod-fs-exfat-kernel
 endef
 
 define Package/automount/description