From f48f1a2a9de269e231e313be953f85ef9ecd1818 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Sat, 8 Jan 2022 19:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Patch:=20fix=5Fntfs3=5Fant?=
 =?UTF-8?q?fs=5Fconflict.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Patches/fix_ntfs3_antfs_conflict.patch    | 34 +++++++++++++++++++
 Scripts/AutoBuild_DiyScript.sh                |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 CustomFiles/Patches/fix_ntfs3_antfs_conflict.patch

diff --git a/CustomFiles/Patches/fix_ntfs3_antfs_conflict.patch b/CustomFiles/Patches/fix_ntfs3_antfs_conflict.patch
new file mode 100644
index 0000000..6b86ed1
--- /dev/null
+++ b/CustomFiles/Patches/fix_ntfs3_antfs_conflict.patch
@@ -0,0 +1,34 @@
+diff -uprN antfs-mount/Makefile antfs-mount1/Makefile
+--- antfs-mount/Makefile
++++ antfs-mount1/Makefile
+@@ -1,7 +1,7 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=antfs-mount
+-PKG_RELEASE:=1
++PKG_RELEASE:=2
+ 
+ include $(INCLUDE_DIR)/package.mk
+ 
+@@ -22,7 +22,7 @@ endef
+ 
+ define Package/antfs-mount/install
+ 	$(INSTALL_DIR) $(1)/sbin
+-	$(INSTALL_BIN) ./files/mount.ntfs $(1)/sbin
++	$(INSTALL_BIN) ./files/mount.antfs $(1)/sbin
+ endef
+ 
+ $(eval $(call BuildPackage,antfs-mount))
+diff -uprN antfs-mount/files/mount.antfs antfs-mount1/files/mount.antfs
+--- antfs-mount/files/mount.antfs
++++ antfs-mount1/files/mount.antfs
+@@ -0,0 +1,3 @@
++#!/bin/sh
++mount -t antfs "$@" -o rw,noatime,async,nodiratime,relatime
++
+diff -uprN antfs-mount/files/mount.ntfs antfs-mount1/files/mount.ntfs
+--- antfs-mount/files/mount.ntfs
++++ antfs-mount1/files/mount.ntfs
+@@ -1,2 +0,0 @@
+-#!/bin/sh
+-mount -t antfs "$@"
diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh
index b807556..cebe20b 100755
--- a/Scripts/AutoBuild_DiyScript.sh
+++ b/Scripts/AutoBuild_DiyScript.sh
@@ -56,6 +56,7 @@ Firmware_Diy() {
 		# AddPackage svn other luci-app-ddnsto linkease/nas-packages/trunk/luci
 		# AddPackage svn other ddnsto linkease/nas-packages/trunk/network/services
 		patch < ${CustomFiles}/Patches/revert_remove-alterId-config.patch -p0 -d ${Home}/package/other
+		patch < ${CustomFiles}/Patches/fix_ntfs3_antfs_conflict.patch -p0 -d ${Home}/feeds/packages/utils
 
 		case "${TARGET_PROFILE}" in
 		d-team_newifi-d2)