Преглед изворни кода

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 <antoine.tenart@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Antoine Tenart пре 5 година
родитељ
комит
fb2968707b
1 измењених фајлова са 4 додато и 3 уклоњено
  1. 4 3
      package/refpolicy/refpolicy.mk

+ 4 - 3
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