From patchwork Tue Jan 30 04:31:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126198 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp3021629ljd; Mon, 29 Jan 2018 20:32:30 -0800 (PST) X-Google-Smtp-Source: AH8x225leJUlhv9btKi+6yK/h0V3N5fIi/aLvxniAXGGIg25H2IPqmEhaK6FxYgxw6zyJyhR6Qql X-Received: by 10.101.99.203 with SMTP id n11mr14247149pgv.78.1517286750764; Mon, 29 Jan 2018 20:32:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517286750; cv=none; d=google.com; s=arc-20160816; b=Y6J8PfL1PSXCEZaYYRginuzStqXMwC+NxC23l3ASu8MQEj7Xp+8ZG91XR+OJ+oaQgA OCWCBs+Te1DP+xIJYIB/xIgVAYksvF/+8wSIDt9nuN32XtROc0xaAqMMT3Mh/DyCy/Nn VlVgJCqLfb8jV1D64Ewop39Eg6yGQEDy3jsrcR1Mo77f7I8EYtw9D//KriqTeorzwReZ E5TnnoZqSCa0gTt+2iUCSsWu7hIS9n913mud3eCPmmcIj8OWTMhoxwZq0fOv16iAsg9y ekPSsC3tgczDxkzzpzNpGVgYHXiiaHN197pqgMpmEXK0I71J4QnQ/1pXYd1Lf1fu3kma n3/g== 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=SS2MDSh0M8LQsH8VFeN7vMoZf6lDuqOZapht+SOwP28=; b=qjP3Fs6/T+CKSeYJz/jSWP7vANsKfKW9TOCCvQBecKLgrQGg6X6pZj2CVGqyCPdyoI DQNqn+TzQEGnqe2IND5VTcg0jCOQoKU05s/25mdrjDV9QSzPwHkxC+hqRnAtu0gIDAvK oU0sjDoaDt3rJrkTR2ae4TZsUsbvvuVFWR62mG9yE0bubwptzj2XtwMr0opeLQ8WYPMA uQqU+ebuIiHnXmkLN+HVl9jS0mNBhKfA/igA8bLrVaIvLLi3/kXQ7ykkp/4Y2nnjFbxH v/lvSB1nQfO+cC8i6zo1/ae+Mp8o4p7aNyY+byTIDWSWC3mGA9Jq9eDj/m+6S8fD6IrY D5tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=r9caq1Nu; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE 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 r88si521807pfl.392.2018.01.29.20.32.30; Mon, 29 Jan 2018 20:32:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=r9caq1Nu; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AABB9788AC; Tue, 30 Jan 2018 04:32:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id ABEBC7889B for ; Tue, 30 Jan 2018 04:32:08 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id i66so7603504pfd.7 for ; Mon, 29 Jan 2018 20:32:10 -0800 (PST) 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=9utHWFgNUseXEQKQ/Z6z/APvkJZkU/hYtLoHBX43Kb4=; b=r9caq1NuAYz3N/T5m/6GueOIAW9F5osPdeeA0d727yGgJT4+t39i87Yy4Vbq/Rk9AM MEPw7KahwAIErGVf2NpOMSTaJtoLNdJ7iXKlWNY0mEq32px4Bj/4hqP9fTsnBAWd7tw2 2tu1ZGUXpGrO57rEdaH4YpcM1QwpWBAi5HwBeogECTOiBUTX0aeLiKpLWrQ6zQxEfP84 ngh2Hxncl7O9QlbrucQsPa+UNzWPaMFQQdGsslmJT25HSJqDM+uaC/NwphuEFwRXuOMq dHgDU7W26B0aS3Op10nFhr6xIcx8wZyg30owVMP1O6s+2NYiHC80BqA2gcvyfrsciaa4 ybJw== 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=9utHWFgNUseXEQKQ/Z6z/APvkJZkU/hYtLoHBX43Kb4=; b=bLdCgDXcE75+jr+0X18aLfH02C6WjEYom8ghtDiAtOkoCzXWWSX0cMDNhCPYGfDeSk yQhCwwFoKHkqTKSGUyTrzKmUaUVUGiA0o0WzGzuhxfWPUdq7aU3w+85juixTHxKFLOax fQcuYfgvaqqMl2q/VUpY461pWT8AMJdPO0D3vJPLDjrPd0E8qRcaoGxMp7jjnFtbZFOy AoIwGjPJlVv52GPpMVcGqqlSzHRz75du/GQHpSBA+kHWSPYrytCIAtZtfOs1Cie9LPAt VJbTLZVZ0C+xFDXiFBdcvy56Y1ZFrHuIbgZ0zSKACQnPwZK7o4UVgAdrFYrEwBrCVYfX d+PQ== X-Gm-Message-State: AKwxytdS67r5KFsUquENypQOd0nLn746DQK6EU2rbUIQFX1shKPBcRw9 G28LvSp5hxKzZPawJWmAo5ykfQ== X-Received: by 10.98.89.71 with SMTP id n68mr13888697pfb.121.1517286729651; Mon, 29 Jan 2018 20:32:09 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::a8d6]) by smtp.gmail.com with ESMTPSA id u67sm1134233pfd.169.2018.01.29.20.32.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 20:32:08 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 20:31:52 -0800 Message-Id: X-Mailer: git-send-email 2.16.1 In-Reply-To: References: Subject: [OE-core] [PATCH 4/8] e2fsprogs: 1.43.7 -> 1.43.8 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Huang Qiyu Upgrade e2fsprogs from 1.43.7 to 1.43.8. Backport patch to fix build on BE systems Signed-off-by: Huang Qiyu Signed-off-by: Khem Raj --- ...ix-build-failure-in-swapfs.c-on-big-endia.patch | 40 ++++++++++++++++++++++ ...s-fix-missing-check-for-permission-denied.patch | 10 ++++-- .../{e2fsprogs_1.43.7.bb => e2fsprogs_1.43.8.bb} | 5 +-- 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.43.7.bb => e2fsprogs_1.43.8.bb} (96%) -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch new file mode 100644 index 0000000000..ff1284edc4 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch @@ -0,0 +1,40 @@ +From ae6603206176b771c9ed1f82569f68fc1257f014 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Wed, 3 Jan 2018 01:32:02 -0500 +Subject: [PATCH] libext2fs: fix build failure in swapfs.c on big-endian + systems + +Addresses-Debian-Bug: #886119 + +Reported-by: James Clarke +Signed-off-by: Theodore Ts'o +--- +Upstream-Status: Backport + + lib/ext2fs/swapfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c +index 6e5cff97..b13dc422 100644 +--- a/lib/ext2fs/swapfs.c ++++ b/lib/ext2fs/swapfs.c +@@ -19,6 +19,7 @@ + + #include "ext2_fs.h" + #include "ext2fs.h" ++#include "ext2fsP.h" + #include + + #ifdef WORDS_BIGENDIAN +@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t, + if (inode_includes(inode_size, i_projid)) + t->i_projid = ext2fs_swab16(f->i_projid); + /* catch new static fields added after i_projid */ +- EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160); ++ EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160); + + i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32); + if (bufsize < (int) i) +-- +2.16.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch index 33054c61fa..69c09bc1d7 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch @@ -1,3 +1,6 @@ +From c7914309aeee6209ddb6995c084805a911d9cc82 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Wed, 10 Aug 2016 11:19:44 +0800 Subject: [PATCH] Fix missing check for permission denied. If the path to "ROOT_SYSCONFDIR/mke2fs.conf" has a permission denied problem, @@ -10,15 +13,16 @@ Upstream-Status: Pending Written-by: Henrik Wallin Signed-off-by: Jackie Huang + --- lib/support/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/support/profile.c b/lib/support/profile.c -index 51a3314..1c1039f 100644 +index 9e96673b..32d83002 100644 --- a/lib/support/profile.c +++ b/lib/support/profile.c -@@ -335,7 +335,7 @@ profile_init(const char **files, profile_t *ret_profile) +@@ -335,7 +335,7 @@ profile_init(const char * const *files, profile_t *ret_profile) *last = new_file; last = &new_file->next; } @@ -28,5 +32,5 @@ index 51a3314..1c1039f 100644 goto errout; -- -2.7.4 +2.16.1 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb similarity index 96% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.7.bb rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb index 168eecfe8e..b5cfc6810b 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.7.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb @@ -7,11 +7,12 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ file://mkdir_p.patch \ file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ -" + file://0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch \ + " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" -SRCREV = "4c5e6cd6defb83f1b35a5ef6fccd68c86874ee06" +SRCREV = "af2eac481cf426c05ae12b946396980e16c8ab19" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \