From 43a206b817c2f81f8127b766ce34315001f0ccaa Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 25 May 2023 14:56:09 +0800 Subject: [PATCH] f2fs-tools: upgrade 1.15.0 -> 1.16.0 0001-f2fs_io-Fix-out-of-tree-builds.patch removed since it's included in 1.16.0 Changelog: ========== relax zone size of power of 2 fix # of total segments Remove deprecated f2fstat define HAVE_CLOCK_GETTIME properly support F2FS_IOC_START_ATOMIC_REPLACE give less overprovisioning space set host-aware zoned device similar to host-managed one fix build error on lz4-1.9.4 use F2FS_BLKSIZE instead of PAGE_*_SIZE fix cannot get bdev information do not use SG_IO in Android move android_config before defining them Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-f2fs_io-Fix-out-of-tree-builds.patch | 27 ------------------- ...s-tools_1.15.0.bb => f2fs-tools_1.16.0.bb} | 3 +-- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.15.0.bb => f2fs-tools_1.16.0.bb} (83%) diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch deleted file mode 100644 index aa243bd9c0..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f110e34d7a4929cdea647b98fa177cf1bccf8b1e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 21 Dec 2022 18:21:42 -0800 -Subject: [PATCH] f2fs_io: Fix out of tree builds - -Relative path does not work when searching for include files -when srcdir != builddir - -Upstream-Status: Submitted [https://lore.kernel.org/linux-f2fs-devel/20221222022830.976309-1-raj.khem@gmail.com/T/#t] -Signed-off-by: Khem Raj ---- - tools/f2fs_io/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/f2fs_io/Makefile.am b/tools/f2fs_io/Makefile.am -index 6c17db1..bc4f9d0 100644 ---- a/tools/f2fs_io/Makefile.am -+++ b/tools/f2fs_io/Makefile.am -@@ -1,7 +1,7 @@ - ## Makefile.am - - if LINUX --AM_CPPFLAGS = -I../../include -+AM_CPPFLAGS = -I$(top_srcdir)/include - AM_CFLAGS = -Wall - sbin_PROGRAMS = f2fs_io - f2fs_io_SOURCES = f2fs_io.c diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb similarity index 83% rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb index 5da059f738..997fa1240a 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb @@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "64f2596142800c215cb40a658ebd5793ed37c936" +SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ - file://0001-f2fs_io-Fix-out-of-tree-builds.patch \ file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)"