summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch29
-rw-r--r--meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb (renamed from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb)6
2 files changed, 3 insertions, 32 deletions
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
deleted file mode 100644
index 0a3261b4e..000000000
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 11 Aug 2018 18:49:03 -0700
4Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path
5
6This helps builds when builddir != srcdir
7
8Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 tools/sg_write_buffer/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am
15index 922c328..19c438d 100644
16--- a/tools/sg_write_buffer/Makefile.am
17+++ b/tools/sg_write_buffer/Makefile.am
18@@ -1,7 +1,7 @@
19 ## Makefile.am
20
21 if LINUX
22-AM_CPPFLAGS = -I./include
23+AM_CPPFLAGS = -I$(srcdir)/include
24 AM_CFLAGS = -Wall
25 sbin_PROGRAMS = sg_write_buffer
26 sg_write_buffer_SOURCES = sg_write_buffer.c \
27--
282.18.0
29
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb
index 98bd478f3..d0b299f0b 100644
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.13.0.bb
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3"
7# to provide libuuid 7# to provide libuuid
8DEPENDS = "util-linux" 8DEPENDS = "util-linux"
9 9
10# v1.13.0 10SRCREV = "d41dcbdf46dc3841cd0a0507e6573e38cb6c55bb"
11SRCREV = "284f77f0075a16a2ad1f3b0fb89b7f64a1bc755d"
12SRC_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 \
13 file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \
14 " 12 "
13UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17inherit pkgconfig autotools 17inherit pkgconfig autotools