mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
f2fs-tools: Upgrade to 1.11.0
Fix build with when S != B Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+29
@@ -0,0 +1,29 @@
|
|||||||
|
From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
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 <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
+5
-3
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3"
|
|||||||
# to provide libuuid
|
# to provide libuuid
|
||||||
DEPENDS = "util-linux"
|
DEPENDS = "util-linux"
|
||||||
|
|
||||||
SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174"
|
# v1.11.0
|
||||||
|
SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b"
|
||||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \
|
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"
|
file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \
|
||||||
|
"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit pkgconfig autotools
|
inherit pkgconfig autotools
|
||||||
Reference in New Issue
Block a user