From 4a7221f108dce987f97ee2bed25204b354b35d05 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Mon, 22 Mar 2021 16:37:52 +0800
Subject: [PATCH] exFAT: use out-of-tree module for kernel 5.4

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 package/kernel/exfat/Makefile   | 46 +++++++++++++++++++++++++++++++++
 package/lean/automount/Makefile |  4 +--
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 package/kernel/exfat/Makefile

diff --git a/package/kernel/exfat/Makefile b/package/kernel/exfat/Makefile
new file mode 100644
index 0000000000..287d109ca0
--- /dev/null
+++ b/package/kernel/exfat/Makefile
@@ -0,0 +1,46 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=exfat
+PKG_VERSION:=5.11.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/namjaejeon/linux-exfat-oot/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=85324f1edb1c03f65700164ba4f5750fe5cc7a8b956add321626be69149790f5
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-exfat-oot-$(PKG_VERSION)
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=GPL-2.0-only
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/fs-exfat0
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Filesystems
+  TITLE:=exFAT kernel module
+  URL:=https://github.com/namjaejeon/linux-exfat-oot
+  FILES:=$(PKG_BUILD_DIR)/exfat.ko
+  AUTOLOAD:=$(call AutoProbe,exfat)
+  DEPENDS:=+kmod-nls-base
+endef
+
+define KernelPackage/exfat0/description
+  This package provides the kernel module for exfat.
+endef
+
+define Build/Compile
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(PKG_EXTRA_KCONFIG) \
+	CONFIG_EXFAT_FS=m \
+	modules
+endef
+
+$(eval $(call KernelPackage,fs-exfat0))
diff --git a/package/lean/automount/Makefile b/package/lean/automount/Makefile
index 766f82b046..463c34ebe8 100644
--- a/package/lean/automount/Makefile
+++ b/package/lean/automount/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=automount
 PKG_VERSION:=1
-PKG_RELEASE:=33
+PKG_RELEASE:=$(COMMITCOUNT)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -17,7 +17,7 @@ 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
+	+kmod-fs-vfat +kmod-fs-ext4 +LINUX_5_4:kmod-fs-exfat0 +!LINUX_5_4:kmod-fs-exfat +ntfs-3g
   PKGARCH:=all
 endef