archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5838 from heitbaum/ntfs3

Browse Source 
Replace ntfs-3g_ntfsprogs with Linux kernel 5.15 ntfs3
This commit is contained in:
CvH
2021-12-15 16:48:43 +01:00
committed by GitHub
parent 216778f550 f6e648aad8
commit 3a40533db6
21 changed files with 627 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/show_config
View File

@@ -68,7 +68,6 @@ show_config() {
if [ "${SWAP_SUPPORT}" = "yes" ]; then
config_message+="\n - Swapfile default size:\t\t ${SWAPFILESIZE}"
fi
config_message+="\n - NTFS Support (via Fuse):\t\t ${NTFS3G}"
config_message+="\n - Install HFS Tools:\t\t\t ${HFSTOOLS}"
# Network service configuration

3
distributions/LibreELEC/options
View File

@@ -193,9 +193,6 @@
# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
INITRAMFS_PARTED_SUPPORT="no"
# build and install NTFS-3G fuse support (yes / no)
NTFS3G="yes"
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"

593
packages/linux/patches/default/fs-ntfs3-since-5-15.patch Normal file
View File

File diff suppressed because it is too large Load Diff

42
packages/sysutils/ntfs-3g_ntfsprogs/package.mk
View File

@@ -1,42 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="ntfs-3g_ntfsprogs"
PKG_VERSION="2021.8.22"
PKG_SHA256="55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/tuxera/ntfs-3g"
PKG_URL="https://tuxera.com/opensource/${PKG_NAME}-${PKG_VERSION}.tgz"
PKG_DEPENDS_TARGET="toolchain fuse libgcrypt"
PKG_LONGDESC="A NTFS driver with read and write support."
PKG_TOOLCHAIN="autotools"
PKG_BUILD_FLAGS="+lto"
PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \
--disable-dependency-tracking \
--disable-library \
--enable-posix-acls \
--enable-mtab \
--enable-ntfsprogs \
--disable-crypto \
--with-fuse=external \
--with-uuid"
post_makeinstall_target() {
# dont include ntfsprogs.
for i in ${INSTALL}/usr/bin/*; do
if [ "$(basename ${i})" != "ntfs-3g" ]; then
rm ${i}
fi
done
rm -rf ${INSTALL}/sbin
rm -rf ${INSTALL}/usr/sbin/ntfsclone
rm -rf ${INSTALL}/usr/sbin/ntfscp
rm -rf ${INSTALL}/usr/sbin/ntfsundelete
mkdir -p ${INSTALL}/usr/sbin
ln -sf /usr/bin/ntfs-3g ${INSTALL}/usr/sbin/mount.ntfs
ln -sf /usr/sbin/mkntfs ${INSTALL}/usr/sbin/mkfs.ntfs
}

2
packages/sysutils/udevil/config/udevil.conf
View File

@@ -221,7 +221,7 @@ default_options_vfat = nosuid, noexec, nodev, noatime, fmask=0133, dmask=00
default_options_exfat = nosuid, noexec, nodev, noatime
default_options_msdos = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID
default_options_umsdos = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID
default_options_ntfs = nosuid, noexec, nodev, noatime, big_writes, fmask=0133, uid=$UID, gid=$GID, utf8
default_options_ntfs = nosuid, noexec, nodev, noatime, fmask=0133, uid=$UID, gid=$GID
default_options_cifs = nosuid, noexec, nodev, uid=$UID, gid=$GID
default_options_smbfs = nosuid, noexec, nodev, uid=$UID, gid=$GID
default_options_sshfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, nonempty, allow_other

6
packages/sysutils/udevil/package.mk
View File

@@ -26,6 +26,12 @@ post_makeinstall_target() {
mkdir -p ${INSTALL}/usr/bin
cp -PR src/udevil ${INSTALL}/usr/bin
mkdir -p ${INSTALL}/usr/sbin
echo '#!/bin/sh' > ${INSTALL}/usr/sbin/mount.ntfs
echo '/usr/sbin/modprobe ntfs3' >> ${INSTALL}/usr/sbin/mount.ntfs
echo '/usr/bin/mount "$@"' >> ${INSTALL}/usr/sbin/mount.ntfs
chmod 755 ${INSTALL}/usr/sbin/mount.ntfs
}
post_install() {

3
packages/virtual/image/package.mk
View File

@@ -23,9 +23,6 @@ PKG_LONGDESC="Root package used to build and create complete image"
# HFS filesystem tools
[ "${HFSTOOLS}" = "yes" ] && PKG_DEPENDS_TARGET+=" diskdev_cmds"
# NTFS 3G support
[ "${NTFS3G}" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs"
# Remote support
[ "${REMOTE_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" remote"

3
projects/ARM/options
View File

@@ -99,9 +99,6 @@
# build and install diskmounter support (udevil)
UDEVIL="no"
# build and install NTFS-3G fuse support (yes / no)
NTFS3G="no"
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="no"

2
projects/Allwinner/linux/linux.aarch64.conf
View File

@@ -6024,7 +6024,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set

4
projects/Allwinner/linux/linux.arm.conf
View File

@@ -5630,7 +5630,9 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems
#

5
projects/Generic/linux/linux.x86_64.conf
View File

@@ -5875,7 +5875,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems
#

2
projects/NXP/devices/iMX6/linux/linux.arm.conf
View File

@@ -6041,7 +6041,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems

2
projects/NXP/devices/iMX8/linux/linux.aarch64.conf
View File

@@ -5856,7 +5856,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
# CONFIG_FAT_DEFAULT_UTF8 is not set
# CONFIG_EXFAT_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set

2
projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
View File

@@ -6230,7 +6230,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FAT_DEFAULT_UTF8 is not set
# CONFIG_EXFAT_FS is not set
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set

5
projects/RPi/devices/RPi/linux/linux.arm.conf
View File

@@ -4963,7 +4963,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems
#

5
projects/RPi/devices/RPi2/linux/linux.arm.conf
View File

@@ -5108,7 +5108,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems
#

5
projects/RPi/devices/RPi4/linux/linux.aarch64.conf
View File

@@ -5796,7 +5796,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems
#

2
projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf
View File

@@ -5658,7 +5658,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set
# end of DOS/FAT/EXFAT/NT Filesystems

2
projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf
View File

@@ -5654,7 +5654,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set

2
projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf
View File

@@ -6363,7 +6363,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# CONFIG_NTFS_FS is not set
# CONFIG_NTFS3_FS is not set
CONFIG_NTFS3_FS=m
# CONFIG_NTFS3_64BIT_CLUSTER is not set
# CONFIG_NTFS3_LZX_XPRESS is not set
# CONFIG_NTFS3_FS_POSIX_ACL is not set

Some files were not shown because too many files have changed in this diff Show More