[Buildroot] [PATCH] package/refpolicy: make sure xmllint is used
Yann E. MORIN
yann.morin.1998 at free.fr
Mon Sep 27 16:35:28 UTC 2021
Antoine, All,
On 2021-09-23 11:21 +0200, Antoine Tenart spake thusly:
> 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 <jose.pekkarinen at unikie.com>
> Signed-off-by: Antoine Tenart <atenart at kernel.org>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> 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)
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list