From f18cb0ba637de53c39df675711656cd111c030a5 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 7 May 2023 17:58:26 +0200 Subject: [PATCH] f2fs-tools: update to 1.16.0 Remove upstramed patches: - 100-configure.ac-fix-AC_ARG_WITH.patch - 101-configure.ac-fix-cross-compilation.patch Remove deprecated f2fstat tool: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=77bf7ed29f1dd1341079913f3b36fc62f812c4f5 Changelog: 06c027a f2fs-tools: upgrade version 1.16.0 542cc57 fsck.f2fs: fix sanity check logic for cp_payload a7df89e mkfs.f2fs: remove indentation c82985a fsck.f2fs: don't call report_zone on normal partition 0ac168e f2fs-tools: relax zone size of power of 2 641be32 mkfs.f2fs: trim all the devices except the first one 3835fef f2fs-tools: fix # of total segments 5b08ca9 f2fs_io: support AES_256_HCTR2 ae3301c f2fs_io: Fix out of tree builds ddbde27 fsck.f2fs: relocate chksum verification step during f2fs_do_mount() 77bf7ed f2fs-tools: Remove deprecated f2fstat fb6575e Remove sg_write_buffer 1bb669e fsck.f2fs: avoid uncessary recalculation ccd2361 fsck.f2fs: fix potential overflow of copying i_name cd6b133 fsck.f2fs: add parentheses for SB_MASK 399600a dump.f2fs: remove unavailable option -g 3e6e178 f2fs-tools: define HAVE_CLOCK_GETTIME properly 907b972 f2fs-tools: support F2FS_IOC_START_ATOMIC_REPLACE 9ff70fb f2fs-tools: give less overprovisioning space 844f821 f2fs-tools: set host-aware zoned device similar to host-managed one 88ac76d fsck.f2fs: fix missing to assign c.zoned_model 8cbe34e fsck.f2fs: trigger repairing if filesystem has inconsistent errors 2f1dde2 fsck.f2fs: trigger repairing if filesystem was forced to stop 465159f fsck.f2fs: export valid image size 3486b62 mkfs.f2fs: update allocation policy for ro feature bdd51e5 fsck.f2fs: fix __end_block_addr() 5a5e419 Always use sparse/sparse.h when building for Android 19f77c6 f2fs-tools: fix build error on lz4-1.9.4 986c1f1 Fix format strings in log messages 0d6acbe fsck.f2fs: use elapsed_time in checkpoint for period check 9b7a4c5 mkfs.f2fs: catch total_zones=0 instead of crashing 6148db3 f2fs-tools: use F2FS_BLKSIZE instead of PAGE_*_SIZE f09c2b7 f2fs_io: support triggering filesystem GC via ioctl 32e7d27 configure.ac: fix cross compilation 65fe94e configure.ac: fix AC_ARG_WITH 6325cf7 Use F2FS_BLKSIZE as the size of struct f2fs_summary_block c89be7a Use F2FS_BLKSIZE for dev_read_block() buffers 5317d18 Improve compile-time type checking for f2fs_report_zone() 92e2e52 Fix f2fs_report_zone() 648a491 Fix the struct f2fs_dentry_block definition c964547 resize.f2fs: add option to manually specify new overprovision a741438 fsck.f2fs: drop compression bit if inline_data is set 406b1c9 f2fs-tools: fix cannot get bdev information 9d0cb9e f2fs_io: add dsync option for write a7b8b46 tools: fix file too large causing overflow bddca6f dump.f2fs: add -I nid to dump inode by scan full disk ebc3879 android_config: add time headers c1144bf Check fallthrough in mount.h for Mac bcb9929 avoid unnecessary function 7d902f4 Fix dependencies on linux/blkzoned.h when using Bionic. 274abbb Remove unnecessary config.h 8c97ab3 libzone: remove duplicate header adcec10 Support zoned device if libc exists efc2bc7 mkfs.f2fs: fix typo 3034a41 mkfs.f2fs: split unused parameter dd8d8e5 f2fs-tools: do not use SG_IO in Android 4f216e6 f2fs-tools: move android_config before defining them 48c5dbb f2fscrypt: adjust config file first 4b55459 android_config: add missing uuid library Signed-off-by: Nick Hainke --- package/utils/f2fs-tools/Makefile | 7 +- .../100-configure.ac-fix-AC_ARG_WITH.patch | 88 ------------------- ...1-configure.ac-fix-cross-compilation.patch | 80 ----------------- 3 files changed, 3 insertions(+), 172 deletions(-) delete mode 100644 package/utils/f2fs-tools/patches/100-configure.ac-fix-AC_ARG_WITH.patch delete mode 100644 package/utils/f2fs-tools/patches/101-configure.ac-fix-cross-compilation.patch diff --git a/package/utils/f2fs-tools/Makefile b/package/utils/f2fs-tools/Makefile index c4e3720dd8dd..27a6fd2248ea 100644 --- a/package/utils/f2fs-tools/Makefile +++ b/package/utils/f2fs-tools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=f2fs-tools -PKG_VERSION:=1.15.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.16.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/ -PKG_HASH:=147d471040b44900283ce2c935f1d35d13d7f40008e7cb8fab2b69f54da01a4f +PKG_HASH:=208c7a07e95383fbd7b466b5681590789dcb41f41bf197369c41a95383b57c5e PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0-only @@ -143,7 +143,6 @@ Package/f2fsck-selinux/install = $(Package/f2fsck/install) define Package/f2fs-tools/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/f2fstat $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fibmap.f2fs $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/parse.f2fs $(1)/usr/sbin endef diff --git a/package/utils/f2fs-tools/patches/100-configure.ac-fix-AC_ARG_WITH.patch b/package/utils/f2fs-tools/patches/100-configure.ac-fix-AC_ARG_WITH.patch deleted file mode 100644 index a7fb50a63d1f..000000000000 --- a/package/utils/f2fs-tools/patches/100-configure.ac-fix-AC_ARG_WITH.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 9af8ee5baceab59d46154c96da62b52935f363fe Mon Sep 17 00:00:00 2001 -From: Nick Hainke -Date: Mon, 27 Jun 2022 20:43:11 +0200 -Subject: [PATCH] configure.ac: fix AC_ARG_WITH - -In the new version the configuration no longer respects the ---without/--with blkid/selinux parameters. Add the tests for -"with_blkid" and "with_selinux" back to configure.ac as described -in the manual. - -Link: https://www.gnu.org/software/autoconf/manual/autoconf-2.60/html_node/External-Software.html - -Fixes: c48335416a09 ("configure.ac: Enable cross-compilation") - -Signed-off-by: Nick Hainke ---- - configure.ac | 44 ++++++++++++++++++++++++++++++-------------- - 1 file changed, 30 insertions(+), 14 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -39,12 +39,16 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign - - # Test configure options. - AC_ARG_WITH([selinux], -- AS_HELP_STRING([--without-selinux], -- [Ignore presence of libselinux and disable selinux support])) -+ [AS_HELP_STRING([--without-selinux], -+ [Ignore presence of libselinux and disable selinux support])], -+ [], -+ [with_selinux=check]) - - AC_ARG_WITH([blkid], -- AS_HELP_STRING([--without-blkid], -- [Ignore presence of libblkid and disable blkid support])) -+ [AS_HELP_STRING([--without-blkid], -+ [Ignore presence of libblkid and disable blkid support])], -+ [], -+ [with_blkid=check]) - - # Checks for programs. - AC_PROG_CC -@@ -55,11 +59,17 @@ AC_PATH_PROG([LDCONFIG], [ldconfig], - [$PATH:/sbin]) - - # Checks for libraries. --AC_CHECK_LIB([blkid], [blkid_probe_all], -- [AC_SUBST([libblkid_LIBS], ["-lblkid"]) -- AC_DEFINE([HAVE_LIBBLKID], [1], -- [Define if you have libblkid]) -- ], [], []) -+AS_IF([test "x$with_blkid" != xno], -+ [AC_CHECK_LIB([blkid], [blkid_probe_all], -+ [AC_SUBST([libblkid_LIBS], ["-lblkid"]) -+ AC_DEFINE([HAVE_LIBBLKID], [1], -+ [Define if you have libblkid]) -+ ], -+ [if test "x$with_blkid" != xcheck; then -+ AC_MSG_FAILURE( -+ [--with-blkid was given, but test for blkid failed]) -+ fi -+ ], -lblkid)]) - - AC_CHECK_LIB([lzo2], [main], - [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) -@@ -73,11 +83,17 @@ AC_CHECK_LIB([lz4], [main], - [Define if you have liblz4]) - ], [], []) - --AC_CHECK_LIB([selinux], [getcon], -- [AC_SUBST([libselinux_LIBS], ["-lselinux"]) -- AC_DEFINE([HAVE_LIBSELINUX], [1], -- [Define if you have libselinux]) -- ], [], []) -+AS_IF([test "x$with_selinux" != xno], -+ [AC_CHECK_LIB([selinux], [getcon], -+ [AC_SUBST([libselinux_LIBS], ["-lselinux"]) -+ AC_DEFINE([HAVE_LIBSELINUX], [1], -+ [Define if you have libselinux]) -+ ], -+ [if test "x$with_selinux" != xcheck; then -+ AC_MSG_FAILURE( -+ [--with-selinux was given, but test for selinux failed]) -+ fi -+ ], -lselinux)]) - - AC_CHECK_LIB([uuid], [uuid_clear], - [AC_SUBST([libuuid_LIBS], ["-luuid"]) diff --git a/package/utils/f2fs-tools/patches/101-configure.ac-fix-cross-compilation.patch b/package/utils/f2fs-tools/patches/101-configure.ac-fix-cross-compilation.patch deleted file mode 100644 index b9edd6634b8c..000000000000 --- a/package/utils/f2fs-tools/patches/101-configure.ac-fix-cross-compilation.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 821a1d3fcce31c234512a8f4dc4fc97dfbd7ae32 Mon Sep 17 00:00:00 2001 -From: Nick Hainke -Date: Mon, 4 Jul 2022 09:46:10 +0200 -Subject: [PATCH] configure.ac: fix cross compilation - -AC_CHECK_LIB seems to not work correctly with OpenWrt. Add possibility -to disable lz4 and lzo2 manually. - -Fixes errors in the form of: - Package f2fsck is missing dependencies for the following libraries: - liblz4.so.1 - liblzo2.so.2 - -Signed-off-by: Nick Hainke ---- - configure.ac | 44 ++++++++++++++++++++++++++++++++++---------- - 1 file changed, 34 insertions(+), 10 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -50,6 +50,18 @@ AC_ARG_WITH([blkid], - [], - [with_blkid=check]) - -+AC_ARG_WITH([lzo2], -+ [AS_HELP_STRING([--without-lzo2], -+ [Ignore presence of liblzo2 and disable lzo2 support])], -+ [], -+ [with_lzo2=check]) -+ -+AC_ARG_WITH([lz4], -+ [AS_HELP_STRING([--without-lz4], -+ [Ignore presence of liblz4 and disable lz4 support])], -+ [], -+ [with_lz4=check]) -+ - # Checks for programs. - AC_PROG_CC - AM_PROG_AR -@@ -71,17 +83,29 @@ AS_IF([test "x$with_blkid" != xno], - fi - ], -lblkid)]) - --AC_CHECK_LIB([lzo2], [main], -- [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) -- AC_DEFINE([HAVE_LIBLZO2], [1], -- [Define if you have liblzo2]) -- ], [], []) -- --AC_CHECK_LIB([lz4], [main], -- [AC_SUBST([liblz4_LIBS], ["-llz4"]) -- AC_DEFINE([HAVE_LIBLZ4], [1], -- [Define if you have liblz4]) -- ], [], []) -+AS_IF([test "x$with_lzo2" != xno], -+ [AC_CHECK_LIB([lzo2], [main], -+ [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) -+ AC_DEFINE([HAVE_LIBLZO2], [1], -+ [Define if you have liblzo2]) -+ ], -+ [if test "x$with_lzo2" != xcheck; then -+ AC_MSG_FAILURE( -+ [--with-lzo2 was given, but test for lzo2 failed]) -+ fi -+ ], -llzo2)]) -+ -+AS_IF([test "x$with_lz4" != xno], -+ [AC_CHECK_LIB([lz4], [main], -+ [AC_SUBST([liblz4_LIBS], ["-llz4"]) -+ AC_DEFINE([HAVE_LIBLZ4], [1], -+ [Define if you have liblz4]) -+ ], -+ [if test "x$with_lz4" != xcheck; then -+ AC_MSG_FAILURE( -+ [--with-lz4 was given, but test for lz4 failed]) -+ fi -+ ], -llz4)]) - - AS_IF([test "x$with_selinux" != xno], - [AC_CHECK_LIB([selinux], [getcon], -- 2.30.2