From 547288ad6a7542932ecf73e45503fde8fe745fed Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 11 Aug 2018 18:35:04 -0700 Subject: f2fs-tools: Upgrade to 1.11.0 Fix build with when S != B Signed-off-by: Khem Raj --- ...-Use-srcdir-prefix-to-denote-include-path.patch | 29 +++++++++++++++++ .../0002-Fix-mkfs-out-of-tree-builds.patch | 37 ---------------------- .../recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb | 20 ++++++++++++ .../recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb | 18 ----------- 4 files changed, 49 insertions(+), 55 deletions(-) create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb (limited to 'meta-filesystems') diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch new file mode 100644 index 0000000000..0a3261b4e7 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch @@ -0,0 +1,29 @@ +From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 11 Aug 2018 18:49:03 -0700 +Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path + +This helps builds when builddir != srcdir + +Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1] +Signed-off-by: Khem Raj +--- + tools/sg_write_buffer/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am +index 922c328..19c438d 100644 +--- a/tools/sg_write_buffer/Makefile.am ++++ b/tools/sg_write_buffer/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am + + if LINUX +-AM_CPPFLAGS = -I./include ++AM_CPPFLAGS = -I$(srcdir)/include + AM_CFLAGS = -Wall + sbin_PROGRAMS = sg_write_buffer + sg_write_buffer_SOURCES = sg_write_buffer.c \ +-- +2.18.0 + 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 deleted file mode 100644 index 9e561cb111..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001 -From: "Yong, Jonathan" -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 -Signed-off-by: Jaegeuk Kim - -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 - ---- - 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.11.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb new file mode 100644 index 0000000000..2240049d44 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Tools for Flash-Friendly File System (F2FS)" +HOMEPAGE = "http://sourceforge.net/projects/f2fs-tools/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" + +# to provide libuuid +DEPENDS = "util-linux" + +# v1.11.0 +SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b" +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-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \ + " +S = "${WORKDIR}/git" + +inherit pkgconfig autotools + +BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb deleted file mode 100644 index 691cb6ea0e..0000000000 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE = "http://sourceforge.net/projects/f2fs-tools/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" - -# to provide libuuid -DEPENDS = "util-linux" - -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://0002-Fix-mkfs-out-of-tree-builds.patch" -S = "${WORKDIR}/git" - -inherit pkgconfig autotools - -BBCLASSEXTEND = "native" -- cgit 1.2.3-korg