From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mail.openembedded.org (Postfix) with ESMTP id C70F37760E for ; Thu, 6 Apr 2017 08:13:38 +0000 (UTC) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP; 06 Apr 2017 01:13:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,283,1488873600"; d="scan'208";a="85487611" Received: from vanguard-01.png.intel.com ([10.221.118.162]) by fmsmga006.fm.intel.com with ESMTP; 06 Apr 2017 01:13:39 -0700 From: "Yong, Jonathan" To: openembedded-devel@lists.openembedded.org Date: Thu, 6 Apr 2017 08:13:36 +0000 Message-Id: <20170406081336.20321-2-jonathan.yong@intel.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170406081336.20321-1-jonathan.yong@intel.com> References: <20170406081336.20321-1-jonathan.yong@intel.com> Subject: [PATCH] f2fs-tools: Update to Version 1.8.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2017 08:13:38 -0000 mkfs patch is already upstreamed. Signed-off-by: Yong, Jonathan --- .../0002-Fix-mkfs-out-of-tree-builds.patch | 28 ++++++++++++++++++++++ .../{f2fs-tools_1.4.0.bb => f2fs-tools_1.8.0.bb} | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.4.0.bb => f2fs-tools_1.8.0.bb} (81%) 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 0000000..39453f3 --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch @@ -0,0 +1,28 @@ +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 +--- + 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 similarity index 81% rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb index 1a558e7..691cb6e 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 -- 2.10.2