summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch37
-rw-r--r--meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb (renamed from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb)5
2 files changed, 40 insertions, 2 deletions
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
new file mode 100644
index 000000000..9e561cb11
--- /dev/null
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
@@ -0,0 +1,37 @@
1From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001
2From: "Yong, Jonathan" <jonathan.yong@intel.com>
3Date: Thu, 30 Mar 2017 08:03:37 +0000
4Subject: [PATCH] Fix mkfs out of tree builds
5
6Libraries are built in builddir, not srcdir, fix Makefile.am
7accordingly.
8
9Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
10Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
11
12The patch was imported from the f2fs-tools repo
13(git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git)
14commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a.
15
16Upstream-Status: Accepted, expected to be included in 1.9.0.
17
18Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
19
20---
21 mkfs/Makefile.am | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
25index 162a0cf..0ea8b49 100644
26--- a/mkfs/Makefile.am
27+++ b/mkfs/Makefile.am
28@@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la
29 libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
30 libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
31 libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
32-libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \
33+libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \
34 -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
35--
362.10.2
37
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
index 1a558e715..691cb6ea0 100644
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3"
7# to provide libuuid 7# to provide libuuid
8DEPENDS = "util-linux" 8DEPENDS = "util-linux"
9 9
10SRCREV = "baac4b4e6f41ceb02511da49dd3707674f3fea21" 10SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174"
11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ 11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \
12 file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch" 12 file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \
13 file://0002-Fix-mkfs-out-of-tree-builds.patch"
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
14 15
15inherit pkgconfig autotools 16inherit pkgconfig autotools