diff options
author | Yong, Jonathan <jonathan.yong@intel.com> | 2017-04-06 08:41:29 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-18 14:21:37 +0200 |
commit | eb97a736f339c70a102cc07871be7da3b711b68c (patch) | |
tree | 8610441a1f9d5007f2d2e175d8e5c1a8716725fa | |
parent | 2cdea6c5bb09aa90184c17c9157f4fed0e10b3c2 (diff) | |
download | meta-openembedded-contrib-eb97a736f339c70a102cc07871be7da3b711b68c.tar.gz |
f2fs-tools: Update to Version 1.8.0
Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch | 37 | ||||
-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 0000000000..9e561cb111 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch @@ -0,0 +1,37 @@ +From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001 +From: "Yong, Jonathan" <jonathan.yong@intel.com> +Date: Thu, 30 Mar 2017 08:03:37 +0000 +Subject: [PATCH] Fix mkfs out of tree builds + +Libraries are built in builddir, not srcdir, fix Makefile.am +accordingly. + +Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> +Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> + +The patch was imported from the f2fs-tools repo +(git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git) +commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a. + +Upstream-Status: Accepted, expected to be included in 1.9.0. + +Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> + +--- + mkfs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am +index 162a0cf..0ea8b49 100644 +--- a/mkfs/Makefile.am ++++ b/mkfs/Makefile.am +@@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la + libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c + libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD + libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include +-libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \ ++libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \ + -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) +-- +2.10.2 + 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 1a558e715b..691cb6ea0e 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" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "baac4b4e6f41ceb02511da49dd3707674f3fea21" +SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch" + file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ + file://0002-Fix-mkfs-out-of-tree-builds.patch" S = "${WORKDIR}/git" inherit pkgconfig autotools |