diff options
Diffstat (limited to 'meta-filesystems/recipes-utils')
-rw-r--r-- | meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs_io-Fix-out-of-tree-builds.patch | 27 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb (renamed from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.15.0.bb) | 3 |
2 files changed, 1 insertions, 29 deletions
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 @@ | |||
1 | From f110e34d7a4929cdea647b98fa177cf1bccf8b1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 21 Dec 2022 18:21:42 -0800 | ||
4 | Subject: [PATCH] f2fs_io: Fix out of tree builds | ||
5 | |||
6 | Relative path does not work when searching for include files | ||
7 | when srcdir != builddir | ||
8 | |||
9 | Upstream-Status: Submitted [https://lore.kernel.org/linux-f2fs-devel/20221222022830.976309-1-raj.khem@gmail.com/T/#t] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | tools/f2fs_io/Makefile.am | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/tools/f2fs_io/Makefile.am b/tools/f2fs_io/Makefile.am | ||
16 | index 6c17db1..bc4f9d0 100644 | ||
17 | --- a/tools/f2fs_io/Makefile.am | ||
18 | +++ b/tools/f2fs_io/Makefile.am | ||
19 | @@ -1,7 +1,7 @@ | ||
20 | ## Makefile.am | ||
21 | |||
22 | if LINUX | ||
23 | -AM_CPPFLAGS = -I../../include | ||
24 | +AM_CPPFLAGS = -I$(top_srcdir)/include | ||
25 | AM_CFLAGS = -Wall | ||
26 | sbin_PROGRAMS = f2fs_io | ||
27 | 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 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" | |||
7 | # to provide libuuid | 7 | # to provide libuuid |
8 | DEPENDS = "util-linux" | 8 | DEPENDS = "util-linux" |
9 | 9 | ||
10 | SRCREV = "64f2596142800c215cb40a658ebd5793ed37c936" | 10 | SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7" |
11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ | 11 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ |
12 | file://0001-f2fs_io-Fix-out-of-tree-builds.patch \ | ||
13 | file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ | 12 | file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ |
14 | " | 13 | " |
15 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 14 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |