From cd5efba6afc0d70942dbf6c5939a8eba405f6cab Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sun, 11 Sep 2022 10:10:16 +0800
Subject: [PATCH] automount: replace ntfs-3g with ntfs3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit ae337809672f331a906faa0b3cea5c5e034e68cc)
---
 package/emortal/automount/Makefile         | 34 ++++++++++++++++++----
 package/emortal/automount/files/mount.ntfs |  2 ++
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 package/emortal/automount/files/mount.ntfs

diff --git a/package/emortal/automount/Makefile b/package/emortal/automount/Makefile
index b061d161c5..fc10e32ab1 100644
--- a/package/emortal/automount/Makefile
+++ b/package/emortal/automount/Makefile
@@ -11,24 +11,40 @@ PKG_NAME:=automount
 PKG_FLAGS:=nonshared
 PKG_RELEASE:=$(COMMITCOUNT)
 
-PKG_CONFIG_DEPENDS:=CONFIG_TARGET_ramips
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_LINUX_4_19 \
+	CONFIG_TARGET_ramips
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/automount
   TITLE:=Mount autoconfig hotplug script.
   MAINTAINER:=Lean
-  DEPENDS:=+block-mount +kmod-fs-exfat +kmod-fs-ext4 +kmod-fs-vfat +ntfs-3g \
-	+kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas
+  DEPENDS:= \
+    +block-mount \
+    +kmod-usb-storage \
+    +kmod-usb-storage-extras \
+    +!TARGET_ramips:kmod-usb-storage-uas \
+    +kmod-fs-ext4 \
+    +kmod-fs-exfat \
+    +kmod-fs-vfat \
+    +LINUX_4_19:ntfs3-mount \
+    +!LINUX_4_19:ntfs-3g
   PKGARCH:=all
 endef
 
-define Package/automount/description
-  A usb autoconfig hotplug script.
+define Package/ntfs3-mount
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Filesystem
+  TITLE:=NTFS mount script for Paragon NTFS3 driver
+  DEPENDS:=+kmod-fs-ntfs3
+  CONFLICTS:=ntfs-3g
+  VARIANT:=ntfs3-mount
+  PKGARCH:=all
 endef
 
 define Build/Compile
-	true
 endef
 
 define Package/automount/install
@@ -36,4 +52,10 @@ define Package/automount/install
 	$(INSTALL_BIN) ./files/15-automount $(1)/etc/hotplug.d/block/
 endef
 
+define Package/ntfs3-mount/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) ./files/mount.ntfs $(1)/sbin
+endef
+
 $(eval $(call BuildPackage,automount))
+$(eval $(call BuildPackage,ntfs3-mount))
diff --git a/package/emortal/automount/files/mount.ntfs b/package/emortal/automount/files/mount.ntfs
new file mode 100644
index 0000000000..68b7a2e68f
--- /dev/null
+++ b/package/emortal/automount/files/mount.ntfs
@@ -0,0 +1,2 @@
+#!/bin/sh
+mount -t ntfs3 -o iocharset=utf8 "$@"