From patchwork Mon Aug 13 08:17:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 144014 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2807702ljj; Mon, 13 Aug 2018 01:19:45 -0700 (PDT) X-Google-Smtp-Source: AA+uWPz/mKtPjOLA8eXC3GRW4fFbf/MCx5YisYgyribIg5hZD/kEEWdJi+e/g/u7FD6KNZansdH7 X-Received: by 2002:a63:5350:: with SMTP id t16-v6mr15872018pgl.196.1534148385383; Mon, 13 Aug 2018 01:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534148385; cv=none; d=google.com; s=arc-20160816; b=HCAjkdXytmXp0/ubB4x0HC1uvTKEwkqeqU+mHEJWuTL5yupaySb28LfKeNN8x89ROc 9R0pe3zIcpjYiy1SiuEc8NNXr06jgp5hcdhHt6mkOcm9w39L0UoNhfchwjVfZH5wLxyl ScAfQ24+Do3eo+PBFizeiwnrCCoeK7wW8K5GDDDhyqMg4wG+N6aUJNT53mEKM1GX8bKH Jslzi5cx0nGHJih+eqC0QuRAaLhMKV/p+16S8nMiODlIo1yAoxmqihJWDpxzBcs8aNi8 dhQvuhpG+TNoePYHeFFb6qRpxG8pG4QwAOesNk+MoK78k5bbYbcG1+z+PjF6z00WMFct xIdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=DO3kODsNs/mE/zMjQ/LCfTWgAuB9ceQzwIv01My7TrU=; b=IeU5dFBuq8EEQ/2cimD4G2dhMC0jeQNmWIaQZ9BCuJLL5xxyBAooGeUJl6NK+/GUI2 +a2QyfqYp5yFbdlbNIw9pGI3OB4zeVbYbHXgtnzRE0/diHbyxx5igvLB/jOE5isAwHiZ sXoLFRdLszTowBHoigpv+YGCcZjV0f64q0dkGbwpmOPFSo1hxCBn9rsPvHnyCPRpXomh khDatZb2iJLTQYzRrM6Bb++UmKMd36V7b1YgKYH3YNw8H3dDw+mrR6xqgohV1+3BC5xx q0hJjQbgsOpM1sjLbBujf8UZu91xobPJ+esBaCFbGKh0t8KpZej57V3OpzRFDwEfmtqi M7lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pxd+182T; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d66-v6si17313042pfa.186.2018.08.13.01.19.45; Mon, 13 Aug 2018 01:19:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pxd+182T; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8363678F7F; Mon, 13 Aug 2018 08:18:32 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by mail.openembedded.org (Postfix) with ESMTP id BF10874607 for ; Mon, 13 Aug 2018 08:18:07 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id f1-v6so7184130pgq.12 for ; Mon, 13 Aug 2018 01:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=txYr0xcolQ4vuw6Eore3TsFubDr2DG/pgyWYCFe6YWw=; b=pxd+182TCbR9iHlKDl4SU+kCo6kpVtmvlNDqTwjEZRADsr5vs4S1IqKxzxVpGPKMjH RtjBhrOz1GRBYWDvY4q0x1QL+emWbCubute4Uzk6zFIFO/p6oQDiOjQEgiWnmavn/W39 LVYWwiaoiYV/ZMVG73BRcvyVJcMXOzTH5F//MH9ubg5M3KzTM8tXjNqcaBuBn4GOvYBS 789INkGxc/PGNegGqKq/42IYP6vSWDnU2tVe1lplecrV0qRXYClnOFHBaWmC1/8J7HGD M4Obud/x8d0QTil+h6OiBczgVRbecqVT7BBKGbpIipKjEZz4aD9R8FtdqiHrOM1WG+0o +dBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=txYr0xcolQ4vuw6Eore3TsFubDr2DG/pgyWYCFe6YWw=; b=LFyxJcyCYp8Io/NDaytPG9Z6nRcoWTZ463dWpXsxw+perPxfUpoGrTzGqUlGKmz69W NzpbfxzOZjq+aNPzDFAolPh+dvpmH4q1A/EsKh9gqoU5+LtSSCz+4vlF4vovCLhBJZ4c oAr1VeyU53RtJxE29Eu7EeNQ85cqI+Vuib2mVhvz0VIHc1vHvfBQZ3isV57SYpJ/GqxI TBVZ3F5uwQmMiLEf51QjlpDzdxFNWD+/N10tVPuSNhJqEcRUAx9GUuIVTWnBJbUBnTW/ IWnMAbFubh1t/qYd3vfuiFnveUAhzb/9H7elIplBZJwa6m7YHIHxS0wASvqknQc3eddx tNCg== X-Gm-Message-State: AOUpUlFdYEO2gbAQ+k7kZ1n1Rwl3NXGKU4qhXmDxMRy02yKu7TxwLCaf KFIImozerUFHaQ72BuSEwciP6ISX X-Received: by 2002:a62:1016:: with SMTP id y22-v6mr17998112pfi.109.1534148288438; Mon, 13 Aug 2018 01:18:08 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::f217]) by smtp.gmail.com with ESMTPSA id b64-v6sm23414971pfg.66.2018.08.13.01.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 01:18:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 13 Aug 2018 01:17:35 -0700 Message-Id: <20180813081742.6961-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180813081742.6961-1-raj.khem@gmail.com> References: <20180813081742.6961-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH 14/21] f2fs-tools: Upgrade to 1.11.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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with when S != B Signed-off-by: Khem Raj --- ...srcdir-prefix-to-denote-include-path.patch | 29 +++++++++++++++ .../0002-Fix-mkfs-out-of-tree-builds.patch | 37 ------------------- ...fs-tools_1.8.0.bb => f2fs-tools_1.11.0.bb} | 8 ++-- 3 files changed, 34 insertions(+), 40 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 rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.8.0.bb => f2fs-tools_1.11.0.bb} (63%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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.8.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb similarity index 63% rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb index 691cb6ea0e..2240049d44 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid 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 \ - file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ - file://0002-Fix-mkfs-out-of-tree-builds.patch" + 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