Make kernel CONFIG options consistent for all targets as related to F…

…2FS support * Add f2fs support in automount script + modify udevil to remove compression mount option for btrfs which may be cause of queue load - add f2fs-tools to virtual package This adds new f2fs-tools package for supportting f2fs filesystems tested: RGB30, RG353M
ROCKNIX · Jan 7, 2025 · 1dda578 · 1dda578
1 parent 10bef3d
commit 1dda578
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 31 deletions.
diff --git a/packages/rocknix/sources/scripts/automount b/packages/rocknix/sources/scripts/automount
@@ -123,7 +123,7 @@ function mount_games() {
       MOUNT_PATH="/storage/games-external"
       FSTYPE=$(blkid -o export ${1} | awk 'BEGIN {FS="="} /TYPE/ {print $2}')
       case ${FSTYPE} in
-        ext4 | btrfs)
+        ext4 | btrfs | f2fs)
           log $0 "Found supported partition for overlayfs."
           if [ -e "/storage/.ms_unsupported" ]
           then
@@ -177,7 +177,7 @@ function mount_games() {
 function find_games() {
   if /usr/bin/busybox mountpoint -q /storage
   then
-    for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /btrfs/ || /fat/ || /ntfs/ {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/ || /btrfs/ || /f2fs/ || /fat/ || /ntfs/ {print $1}' | sort -r; done)
     do
       ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g")
       log $0 "Inspecting ${DEV}."

diff --git a/packages/sysutils/f2fs-tools/package.mk b/packages/sysutils/f2fs-tools/package.mk
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)
+
+
+PKG_NAME="f2fs-tools"
+PKG_VERSION="1.16.0"
+PKG_LICENSE="GPL"
+PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/"
+PKG_URL="${PKG_SITE}/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain libtool e2fsprogs util-linux zlib systemd lzo"
+PKG_LONGDESC="Userspace tools for F2FS; a Filesystem designed for NAND flash memory-based storage devices, such as SSD"
+PKG_TOOLCHAIN=autotools
diff --git a/packages/sysutils/udevil/config/udevil.conf b/packages/sysutils/udevil/config/udevil.conf
@@ -42,7 +42,7 @@ log_keep_days = 10
 # Setting allowed_types = * does NOT allow all types, as this is a security
 # risk, but does allow all recognized types.
 # allowed_types = $KNOWN_FILESYSTEMS, file, cifs, smbfs, nfs, curlftpfs, ftpfs, sshfs, davfs, tmpfs, ramfs
-allowed_types = $KNOWN_FILESYSTEMS, hfsplus, hfs, btrfs
+allowed_types = $KNOWN_FILESYSTEMS, hfsplus, hfs, btrfs, f2fs
 
 
 # allowed_users is a list of users permitted to mount and unmount with udevil.
@@ -230,7 +230,6 @@ default_options_ftpfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
 default_options_davfs     = nosuid, noexec, nodev, uid=$UID, gid=$GID
 default_options_tmpfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
 default_options_ramfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
-default_options_btrfs     = compress=zstd:3
 
 
 # allowed_options determines all options that a user may specify when mounting.

diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
@@ -13,7 +13,7 @@ PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host
                     ${BOOTLOADER} busybox umtprd util-linux usb-modeswitch unzip poppler jq socat \
                     p7zip file initramfs grep wget util-linux btrfs-progs zstd lz4 empty lzo libzip \
                     bash coreutils modules system-utils autostart quirks powerstate gnupg \
-                    gzip six lynx xmlstarlet vim pyudev dialog dbus-python network rocknix"
+                    gzip six lynx xmlstarlet vim pyudev dialog dbus-python network rocknix f2fs-tools"
 
 PKG_UI="emulationstation es-themes textviewer"
 

diff --git a/projects/Allwinner/devices/H700/linux/linux.aarch64.conf b/projects/Allwinner/devices/H700/linux/linux.aarch64.conf
@@ -679,8 +679,9 @@ CONFIG_EXT3_FS_SECURITY=y
 CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_STAT_FS=y
+# CONFIG_F2FS_FS_XATTR is not set
+CONFIG_F2FS_CHECK_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y

diff --git a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf
@@ -5706,13 +5706,12 @@ CONFIG_BTRFS_FS=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
-CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
 # CONFIG_F2FS_FS_XATTR is not set
 CONFIG_F2FS_CHECK_FS=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
-CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
 # CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y

diff --git a/projects/PC/devices/AMD64/linux/linux.x86_64.conf b/projects/PC/devices/AMD64/linux/linux.x86_64.conf
@@ -10564,19 +10564,8 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_FS_XATTR is not set
 CONFIG_F2FS_CHECK_FS=y
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_COMPRESSION=y
-CONFIG_F2FS_FS_LZO=y
-CONFIG_F2FS_FS_LZORLE=y
-CONFIG_F2FS_FS_LZ4=y
-CONFIG_F2FS_FS_LZ4HC=y
-CONFIG_F2FS_FS_ZSTD=y
-CONFIG_F2FS_IOSTAT=y
-CONFIG_F2FS_UNFAIR_RWSEM=y
 # CONFIG_BCACHEFS_FS is not set
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_DAX=y

diff --git a/projects/Qualcomm/devices/SD865/linux/linux.aarch64.conf b/projects/Qualcomm/devices/SD865/linux/linux.aarch64.conf
@@ -7064,13 +7064,12 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_XATTR is not set
+CONFIG_F2FS_CHECK_FS=y
 # CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
-CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
 # CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y

diff --git a/projects/Rockchip/devices/RK3326/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3326/linux/linux.aarch64.conf
@@ -5855,7 +5855,10 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+# CONFIG_F2FS_FS_XATTR is not set
+CONFIG_F2FS_CHECK_FS=y
 # CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y

diff --git a/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3566/linux/linux.aarch64.conf
@@ -6436,7 +6436,10 @@ CONFIG_BTRFS_FS=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+# CONFIG_F2FS_FS_XATTR is not set
+CONFIG_F2FS_CHECK_FS=y
 # CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y

diff --git a/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf b/projects/Rockchip/devices/RK3588/linux/linux.aarch64.conf
@@ -7794,13 +7794,10 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FS_XATTR is not set
+CONFIG_F2FS_CHECK_FS=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
-CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y