From patchwork Thu Mar 26 02:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 1261719 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=aol.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aol.com header.i=@aol.com header.a=rsa-sha256 header.s=a2048 header.b=p88+4aJ7; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48npRQ5mf7z9sSJ for ; Thu, 26 Mar 2020 13:12:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EE31E883ED; Thu, 26 Mar 2020 02:12:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7m8xYY-+WZQn; Thu, 26 Mar 2020 02:12:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7324087FFE; Thu, 26 Mar 2020 02:12:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 131AA1BF2B0 for ; Thu, 26 Mar 2020 02:12:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0B13A859BA for ; Thu, 26 Mar 2020 02:12:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TwIptAyNTANv for ; Thu, 26 Mar 2020 02:12:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from sonic311-25.consmr.mail.ne1.yahoo.com (sonic311-25.consmr.mail.ne1.yahoo.com [66.163.188.206]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 37D3284155 for ; Thu, 26 Mar 2020 02:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1585188760; bh=is43jqklzoiavXvklvkd5DGhQFpgTjmQ8plbqrej+54=; h=From:To:Cc:Subject:Date:References:From:Subject; b=p88+4aJ7cOSUSWQ1dF2cZc9GWRbvtKholtdNZ0Y6mQE5S+T+/0TvvEBtO4fl52CYAClDruKrpx8BWRr6BpaXUKoQD4ZjX2r1qQ1rm+xOxzXBMxNuvoHfla98vTtMJ94vXrFD44I2xszJHudPou8oT2YUrdH7g15bIHIgCDz/TAHOJYwX994SSVdeyAezm4gwaaLCopgax1+Pv6/2oZD0DCvAzV/S/k8FQd1cJeXx95/kZaaNsBOPGsplXLB15mS2xyKR4RKg/s3237efw+hIFFDQNSuUTxxOQdHFDBzXDMVEhVlKiRFGIdUnMzlSaR6DzXBhiWqp7ZzMR2RM2QQmFg== X-YMail-OSG: yBfTumYVM1ma7mJY99Kmn4ISoVoc_8pjgtOagLpuzwy4P1lZkH9jjZCKNSZ1Qmn zRYNEf9.HNcjRN8VwNxvh4_AbsD2XUNLlYPR8hwM4O2kc0m7db5G.pPH.6bbr72zDRoxBien14xX P_YeBGpAkWJUoIAU40odyhxnhDnggIVAE7tbG8XCJoR7hzVCdMRfGUwz8855GTXUCl3051nyDHC1 1CZiQ_kBczqBizKelpNeFaiMM5qnMQM7DhtwD.I66w1aMG5bhh2WBPQl7c.V9xT0xPgqduH3tqzr sAswpidoPl02vliXbh52pk96jsL9orebZ2HJ9ByO3SR_dABQqmwY156OKBf2pONyjCHc1mzR5DZh fwtyI6S76KdjzIWA.CoNYUQ0Yqng38PV4J3cHcQSMqH2LZYb2iBET93DvOjfHIn_fbMSghr7gkE7 NXnrTJHTEKjaDKMc3oN1XgYvrs7JRIARWYxCBhd4PLKjRudkoZDUiWdJiKPAryykVSjODqlRfnrx 8ICsgOCbVpiY64cs24Cz6PCGl8OI87DqTDw1cXLWAdoVEMvPuDJke81kXBm39LlARi2fYOzp14Wj OiPFFtTrlve6orMrhFK7RFDD4B1FnPXsDMusSqtCYgQ20evcgeRifiNyIjME3RC0Tlv9xBnDpMoR MMyxSjaFRA2rcyeeZvZy35ZCSsRrKjZKZFEk4OM6ZfAPQvHPXIbNtR69DzZajvi7D0D957PPnZm. DA254bNwlXnlXLU3CmCvRS98xZfbk.UC4yfsgzvRupE4kvikDZRZOtVHMf9QyAJY_M20PWGplFCh Go1xezBhsVQULE7GLIemL8HQZQzqrgmS.BzEKhBxIPpKKGw5BkJYR74b3C3TKjhrGzlbQVCFBXVh h2Dcpo9U0ANqkq8kAmEM9SJ1W43VVsyTBD7q7PahFT.jI5T5AVNoGwM3HLQnrlv8svWcO_mfsLDQ JC5aOsr7R0FbHupwiBhOLZfqg3Yoajgc_ZVtsR8ArLOLT3wfvQPDmbgpcvk0EenBsvEgsk8mrpmq hygG22FwoGNIxP6L5c6bdT8owztOKg3aF8gMVxCEthffhA007cwzjeeHsVF.IAKnexO8Ye.syxb. 0jxu5yj.IkHCFeK_RsZsjNqxo8A9I5OLSqy4_lIXard9qVKMCrCv1aEJaaFjCl7Qo1.8aDqMbxeV URXpHsfsy0GodcwvNNeZXWDYaOiDToJXWQmLscwWbhslAYag9CsTquFUSTi9osLwyyspAeVjvgfP t4sejDI_JHRds96qRBu1FmQ_PbbbbjkKKgyCEUGmqsK764RB6kNLCjyhnzLH3HPaqx4xU1FuYtyA 9wlJM2vcpLdgoWOi8DqoqNmhSWDNeP5aGCGG3HRATF280m6VCg1tQ2AADkU5mcARKS3ouRZiBEM4 RCjlQu.Gq0LXXAWyiq6mdlQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.ne1.yahoo.com with HTTP; Thu, 26 Mar 2020 02:12:40 +0000 Received: by smtp410.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID c57698d199ffa2f1f239054e3046f444; Thu, 26 Mar 2020 02:12:34 +0000 (UTC) From: Gao Xiang To: buildroot@buildroot.org Date: Thu, 26 Mar 2020 10:12:15 +0800 Message-Id: <20200326021215.23749-1-hsiangkao@aol.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 References: <20200326021215.23749-1-hsiangkao.ref@aol.com> Subject: [Buildroot] [PATCH] package/erofs-utils: add patch to resolve PAGE_SIZE redefinition X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gao Xiang , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch resolves PAGE_SIZE redefinition reported by autobuild [1] with some configrations on i586 platform. As what I said in the patch, I didn't get such error report before. [1] http://autobuild.buildroot.net/results/340b98caa45bafd43f109002be9da59ba7f6d971 Signed-off-by: Gao Xiang --- Hi all, I have no simple way to verify the whole compilation with such configuration due to poor Internet quality to download all necessary packages in China mainland. I've just verified with my own old configuration and it has no impact. Hopefully it's the last patch for all configration to work. Thanks, Gao Xiang ...s-utils-avoid-PAGE_SIZE-redefinition.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/erofs-utils/0004-erofs-utils-avoid-PAGE_SIZE-redefinition.patch diff --git a/package/erofs-utils/0004-erofs-utils-avoid-PAGE_SIZE-redefinition.patch b/package/erofs-utils/0004-erofs-utils-avoid-PAGE_SIZE-redefinition.patch new file mode 100644 index 0000000000..2441a841ba --- /dev/null +++ b/package/erofs-utils/0004-erofs-utils-avoid-PAGE_SIZE-redefinition.patch @@ -0,0 +1,57 @@ +From 6c087a91c968197b5a95578fc645617947c943ad Mon Sep 17 00:00:00 2001 +From: Gao Xiang +Date: Wed, 25 Mar 2020 15:42:22 +0800 +Subject: [PATCH] erofs-utils: avoid PAGE_SIZE redefinition + +Buildroot autobuild reported a PAGE_SIZE redefinition with some +configrations on i586 toolchain [1] (I didn't notice such report +from erofs-utils travis CI or distribution builds before.) + +In file included from config.c:11: +../include/erofs/internal.h:27: error: "PAGE_SIZE" redefined [-Werror] + #define PAGE_SIZE (1U << PAGE_SHIFT) + +In file included from ../include/erofs/defs.h:17, + from ../include/erofs/config.h:12, + from ../include/erofs/print.h:12, + from config.c:10: +.../sysroot/usr/include/limits.h:89: note: this is the location of the previous definition + #define PAGE_SIZE PAGESIZE + +cc1: all warnings being treated as errors + +Fix it now. + +[1] http://autobuild.buildroot.net/results/340b98caa45bafd43f109002be9da59ba7f6d971 +Link: https://lore.kernel.org/r/20200325082930.2025-1-hsiangkao@aol.com +Signed-off-by: Gao Xiang +--- + include/erofs/internal.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/include/erofs/internal.h b/include/erofs/internal.h +index e7d5a64..41da189 100644 +--- a/include/erofs/internal.h ++++ b/include/erofs/internal.h +@@ -23,8 +23,18 @@ typedef unsigned short umode_t; + #define PATH_MAX 4096 /* # chars in a path name including nul */ + #endif + ++#ifndef PAGE_SHIFT + #define PAGE_SHIFT (12) ++#endif ++ ++#ifndef PAGE_SIZE + #define PAGE_SIZE (1U << PAGE_SHIFT) ++#endif ++ ++/* no obvious reason to support explicit PAGE_SIZE != 4096 for now */ ++#if PAGE_SIZE != 4096 ++#error incompatible PAGE_SIZE is already defined ++#endif + + #define LOG_BLOCK_SIZE (12) + #define EROFS_BLKSIZ (1U << LOG_BLOCK_SIZE) +-- +2.20.1 +