From patchwork Wed May 6 12:21:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1284365 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=none (p=none dis=none) header.from=rockwellcollins.com 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 49HG0W5jlcz9sSt for ; Wed, 6 May 2020 22:21:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EC12F87DA3; Wed, 6 May 2020 12:21:10 +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 j5qxeccwkT4O; Wed, 6 May 2020 12:21:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BC3B487825; Wed, 6 May 2020 12:21:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 54E9D1BF82D for ; Wed, 6 May 2020 12:21:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 47CBE20334 for ; Wed, 6 May 2020 12:21:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jr-UJ+XtaISC for ; Wed, 6 May 2020 12:21:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs02.rockwellcollins.com (ch3vs02.rockwellcollins.com [205.175.226.29]) by silver.osuosl.org (Postfix) with ESMTPS id B161B24FAC for ; Wed, 6 May 2020 12:21:03 +0000 (UTC) IronPort-SDR: qx3IlzrrNPQsnInXLorG0xYBgd363LfeIKcCkCFGnZKv/JSs8g4V246VfzYihv5+JfUYvHkpHl /rCuPGdYQ55fiSJG2+xf6VDkW255eDwnrOsguevJ+UAumX7KQ6wlW/p9CTHDHq1YdWDJTu3vel Tqg47NXDcz+DGy6A/37+78WCg0oPCvh+WE+2nprXCp3X+cqCM2UeS9CzhoIcAfe4PWMLcfOeHh dbOnOF3PBM+Sr0HGAxzRfTLx0jcpEo829CE/V1Z3wHPxUQspT4tf1QNIn15nCIGqjdJhvMCm9h agw= Received: from ofwch3n02.rockwellcollins.com (HELO dtulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs02.rockwellcollins.com with ESMTP; 06 May 2020 07:21:03 -0500 X-Received: from biscuits.rockwellcollins.lab (biscuits.rockwellcollins.lab [10.148.119.137]) by dtulimr02.rockwellcollins.com (Postfix) with ESMTP id 1AFF820076; Wed, 6 May 2020 07:21:02 -0500 (CDT) From: Matt Weber To: buildroot@buildroot.org Date: Wed, 6 May 2020 07:21:01 -0500 Message-Id: <20200506122101.48925-1-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/checkpolicy: fix -fno-common build failure 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: Matt Weber , Peter Korsgaard , Romain Naour , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Added upstream patch for removal of unused te_assertions which was found when using GCC10 as a host complier (-fno-common is now default) Fixes: http://autobuild.buildroot.net/results/63f2d1897a8f581ec107374bf2cbb68d3add4109/ Cc: Peter Korsgaard Cc: Romain Naour Cc: Adam Duskett Signed-off-by: Matthew Weber Tested-by: Romain Naour --- Romain, would you mind testing this one on your GCC10 builder? Peter I'm tested that this can be cherry-picked back to 2020.02.x without any issue. I haven't see a build failure yet on that branch but we should. --- ...ckpolicy-remove-unused-te_assertions.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch diff --git a/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch new file mode 100644 index 0000000000..0c4ffcbf87 --- /dev/null +++ b/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch @@ -0,0 +1,45 @@ +From 4d330d0d3155211f119b3082f728ae42dcc01e96 Mon Sep 17 00:00:00 2001 +From: Ondrej Mosnacek +Date: Thu, 23 Jan 2020 13:57:15 +0100 +Subject: [PATCH] checkpolicy: remove unused te_assertions + +This variable is declared in a header file, but never defined or used. +The te_assert structure definition is only used in this declaration, so +remove both. + +Upstream: https://github.com/SELinuxProject/selinux/commit/4d330d0d3155211f119b3082f728ae42dcc01e96#diff-daf264ea505347df0d59a3a97a07742e + +Signed-off-by: Ondrej Mosnacek +Signed-off-by: Matthew Weber +--- + checkpolicy.h | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/checkpolicy.h b/checkpolicy.h +index 3868f1fa..f127687e 100644 +--- a/checkpolicy.h ++++ b/checkpolicy.h +@@ -1,20 +1,6 @@ + #ifndef _CHECKPOLICY_H_ + #define _CHECKPOLICY_H_ + +-#include +- +-typedef struct te_assert { +- ebitmap_t stypes; +- ebitmap_t ttypes; +- ebitmap_t tclasses; +- int self; +- sepol_access_vector_t *avp; +- unsigned long line; +- struct te_assert *next; +-} te_assert_t; +- +-te_assert_t *te_assertions; +- + extern unsigned int policyvers; + + #endif +-- +2.17.1 +