From fb2968707bc66afb2c246d92e15f295475f23868 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Fri, 31 Jul 2020 12:10:39 +0200 Subject: [PATCH] package/refpolicy: fix the configure, build and install steps The refpolicy configure and build step were not correctly defined. The configuration was split between the configure and build step, while both the compilation and the installation were done in the install step. Fix this by moving all the configuration within the configuration step and by adding a call to make in the build step to compile the policy. Signed-off-by: Antoine Tenart Signed-off-by: Thomas Petazzoni --- package/refpolicy/refpolicy.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index dc038001bd..edfbb3542c 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -105,12 +105,13 @@ define REFPOLICY_CONFIGURE_CMDS $(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf $(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf $(REFPOLICY_CONFIGURE_SYSTEMD) + $(REFPOLICY_COPY_EXTRA_MODULES) + $(REFPOLICY_MAKE) -C $(@D) bare conf + $(REFPOLICY_CONFIGURE_MODULES) endef define REFPOLICY_BUILD_CMDS - $(REFPOLICY_COPY_EXTRA_MODULES) - $(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) bare conf - $(REFPOLICY_CONFIGURE_MODULES) + $(REFPOLICY_MAKE) -C $(@D) policy endef define REFPOLICY_INSTALL_STAGING_CMDS -- 2.30.2