From bba5c4345aade8cf5c39f9cc4dc029f6ad7dbbac Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Thu, 23 Sep 2021 11:21:36 +0200 Subject: [PATCH] package/refpolicy: make sure xmllint is used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Yann E. MORIN (cherry picked from commit 5141cee10939c56da3741967c128c58eac190222) Signed-off-by: Peter Korsgaard --- 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 1180f0d38b..ecd8cf226b 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)