Start supporting NTFS in the second tf card slot.

2023-07-05 12:08:40 +00:00 · 2023-07-05 12:08:40 +00:00 · d2c6f8e84c
commit d2c6f8e84c
parent e3294abe1e
15 changed files with 19 additions and 20 deletions
--- a/packages/jelos/sources/scripts/automount
+++ b/packages/jelos/sources/scripts/automount
@ -18,7 +18,7 @@ then
 fi

 load_modules() {
-  for MODULE in exfat vfat
+  for MODULE in exfat vfat ntfs ntfs3
  do
    lsmod | grep ${MODULE} 2>/dev/null
    if [ ! $? = 0 ]
@ -47,7 +47,7 @@ find_games() {
      /usr/bin/busybox mkdir -p /storage/roms >/dev/null 2>&1
    fi

-    for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r; done)
+    for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ || /ntfs/ {print $1}' | sort -r; done)
    do
      ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g")
      SIZE=$(awk '/'${ROOTDEV}'$/ {print $3}' /proc/partitions)
--- a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk
+++ b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk
@ -3,8 +3,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="ntfs-3g_ntfsprogs"
-PKG_VERSION="2021.8.22"
-PKG_SHA256="55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb"
+PKG_VERSION="2022.10.3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/tuxera/ntfs-3g"
 PKG_URL="https://tuxera.com/opensource/${PKG_NAME}-${PKG_VERSION}.tgz"
--- a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf
+++ b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf
@ -6479,8 +6479,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=y
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS3_FS is not set
+CONFIG_NTFS_FS=m
+CONFIG_NTFS3_FS=m
 # end of DOS/FAT/EXFAT/NT Filesystems

 #
--- a/projects/Amlogic/devices/S922X/options
+++ b/projects/Amlogic/devices/S922X/options
@ -135,7 +135,7 @@
    EXFAT="yes"

  # build and install NTFS-3G fuse support (yes / no)
-    NTFS3G="no"
+    NTFS3G="yes"

  # build and install hfs filesystem utilities (yes / no)
    HFSTOOLS="no"
--- a/projects/PC/devices/AMD64/linux/linux.x86_64.conf
+++ b/projects/PC/devices/AMD64/linux/linux.x86_64.conf
@ -10273,7 +10273,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
+CONFIG_NTFS_FS=m
 CONFIG_NTFS3_FS=m
 # CONFIG_NTFS3_64BIT_CLUSTER is not set
 CONFIG_NTFS3_LZX_XPRESS=y
--- a/projects/Rockchip/devices/RK3326/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3326/linux/linux.aarch64.conf
@ -5584,8 +5584,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS3_FS is not set
+CONFIG_NTFS_FS=m
+CONFIG_NTFS3_FS=m
 # end of DOS/FAT/EXFAT/NT Filesystems

 #
--- a/projects/Rockchip/devices/RK3326/options
+++ b/projects/Rockchip/devices/RK3326/options
@ -133,7 +133,7 @@
    EXFAT="yes"

  # build and install NTFS-3G fuse support (yes / no)
-    NTFS3G="no"
+    NTFS3G="yes"

  # build and install hfs filesystem utilities (yes / no)
    HFSTOOLS="no"
--- a/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3399/linux/linux.aarch64.conf
@ -7000,8 +7000,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=y
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS3_FS is not set
+CONFIG_NTFS_FS=m
+CONFIG_NTFS3_FS=m
 # end of DOS/FAT/EXFAT/NT Filesystems

 #
--- a/projects/Rockchip/devices/RK3399/options
+++ b/projects/Rockchip/devices/RK3399/options
@ -130,7 +130,7 @@
    EXFAT="yes"

  # build and install NTFS-3G fuse support (yes / no)
-    NTFS3G="no"
+    NTFS3G="yes"

  # build and install hfs filesystem utilities (yes / no)
    HFSTOOLS="no"
--- a/projects/Rockchip/devices/RK3566-X55/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3566-X55/linux/linux.aarch64.conf
@ -5377,7 +5377,7 @@ CONFIG_EXFAT_VIRTUAL_XATTR=y
 CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:exfat:s0"
 # CONFIG_EXFAT_DEBUG is not set
 # CONFIG_EXFAT_UEVENT is not set
-# CONFIG_NTFS_FS is not set
+CONFIG_NTFS_FS=m

 #
 # Pseudo filesystems
--- a/projects/Rockchip/devices/RK3566-X55/options
+++ b/projects/Rockchip/devices/RK3566-X55/options
@ -127,7 +127,7 @@
    EXFAT="yes"

  # build and install NTFS-3G fuse support (yes / no)
-    NTFS3G="no"
+    NTFS3G="yes"

  # build and install hfs filesystem utilities (yes / no)
    HFSTOOLS="no"
--- a/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf
@ -5543,7 +5543,7 @@ CONFIG_EXFAT_VIRTUAL_XATTR=y
 CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:exfat:s0"
 # CONFIG_EXFAT_DEBUG is not set
 # CONFIG_EXFAT_UEVENT is not set
-# CONFIG_NTFS_FS is not set
+CONFIG_NTFS_FS=m

 #
 # Pseudo filesystems
--- a/projects/Rockchip/devices/RK3566/options
+++ b/projects/Rockchip/devices/RK3566/options
@ -127,7 +127,7 @@
    EXFAT="yes"

  # build and install NTFS-3G fuse support (yes / no)
-    NTFS3G="no"
+    NTFS3G="yes"

  # build and install hfs filesystem utilities (yes / no)
    HFSTOOLS="no"
--- a/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf
+++ b/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf
@ -7328,7 +7328,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=y
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
+CONFIG_NTFS_FS=m
 # end of DOS/FAT/EXFAT/NT Filesystems

 #
--- a/projects/Rockchip/devices/RK3588/options
+++ b/projects/Rockchip/devices/RK3588/options
@ -136,7 +136,7 @@
    EXFAT="yes"

  # build and install NTFS-3G fuse support (yes / no)
-    NTFS3G="no"
+    NTFS3G="yes"

  # build and install hfs filesystem utilities (yes / no)
    HFSTOOLS="no"