From patchwork Thu Sep 23 09:21:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1531656 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=apPlUBCU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HFV6L2hmyz9sW5 for ; Thu, 23 Sep 2021 19:21:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E17EA4163C; Thu, 23 Sep 2021 09:21:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g42-SFKFa70V; Thu, 23 Sep 2021 09:21:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 36919415D1; Thu, 23 Sep 2021 09:21:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 89CE31BF318 for ; Thu, 23 Sep 2021 09:21:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 865EE607B0 for ; Thu, 23 Sep 2021 09:21:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=kernel.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6SL_bysCastY for ; Thu, 23 Sep 2021 09:21:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp3.osuosl.org (Postfix) with ESMTPS id E5C5D607AC for ; Thu, 23 Sep 2021 09:21:39 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id D29B6610D1; Thu, 23 Sep 2021 09:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632388899; bh=N1ACXmkvzb4/cChczYCrrh5nih4nZabKq0dZzEaIpZY=; h=From:To:Cc:Subject:Date:From; b=apPlUBCUv1AH46OvtXK3GMzpUWQh0JxGpzHnrsrEYs58qVR4saSWHDs6VMgZnEsY8 gEhN4Y6we5AiN/BcpOscDvMQsgQ+EGB2M6F0bT3Vldd3hkkaLx4nxSlwOKt6IQX0ZJ prszERdn+Rvwq+AVbG0uD7Q6XCDe73UsiYKadNIwutCdJuq8Y46e0ijuc6uRuCa3I6 46P6nL4cmz3r9mGodj9u8xD28jctcX1ZxEvqOPSiWZyDhYg1YfUshPCUgyWlIg0tw4 oVSvMkLezDTtzwTy6CsNLr2JbU93HT6MdqeafrwsyZ3rjPRTOeQ3ZRfosrIR1GGO2N vIqa/JSJxS9Ng== From: Antoine Tenart To: buildroot@buildroot.org Date: Thu, 23 Sep 2021 11:21:36 +0200 Message-Id: <20210923092136.141553-1-atenart@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/refpolicy: make sure xmllint is used X-BeenThere: buildroot@lists.buildroot.org 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: Antoine Tenart , =?utf-8?q?Jos=C3=A9_Pekkarinen?= Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" When parsing and adding modules the refpolicy build system checks their validity using xmllint. By default the host system version is used and if not found an error is displayed but the build is not stopped. This leads to interesting issues where modules are not added correctly to modules.conf[1] (other possible issues are likely). Fix this by adding a dependency on host-libxml2 and explicitly use the xmllint binary built by Buildroot. [1] https://lore.kernel.org/buildroot/20210830114531.2285178-1-jose.pekkarinen@unikie.com/ Tested-by: José Pekkarinen Signed-off-by: Antoine Tenart --- package/refpolicy/refpolicy.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index eb345d0f98c9..975c3b584c42 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -14,7 +14,8 @@ REFPOLICY_DEPENDENCIES = \ host-policycoreutils \ host-python3 \ host-setools \ - host-gawk + host-gawk \ + host-libxml2 ifeq ($(BR2_PACKAGE_REFPOLICY_CUSTOM_GIT),y) REFPOLICY_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION)) @@ -30,6 +31,7 @@ endif # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ + XMLLINT=$(LIBXML2_HOST_BINARY) \ TEST_TOOLCHAIN=$(HOST_DIR) \ $(TARGET_MAKE_ENV) \ $(MAKE1)