aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@ieee.org>2017-08-06 16:54:40 -0400
committerLuis Ressel <aranea@aixah.de>2017-09-09 00:15:13 +0200
commitc7e818d6ad2afc277e6ef66793a1aa9559bacad1 (patch)
tree60c9f3d5ef6fbf9a961e2c22a9daf74836c8f6fb /Rules.modular
parentModule version bump for patches from Guido Trentalancia and Anthony PERARD. (diff)
downloadhardened-refpolicy-c7e818d6ad2afc277e6ef66793a1aa9559bacad1.tar.gz
hardened-refpolicy-c7e818d6ad2afc277e6ef66793a1aa9559bacad1.tar.bz2
hardened-refpolicy-c7e818d6ad2afc277e6ef66793a1aa9559bacad1.zip
Rules.modular: Fix file context verification.
Disabled modules were included in the file contexts, resulting in false verification errors.
Diffstat (limited to 'Rules.modular')
-rw-r--r--Rules.modular6
1 files changed, 3 insertions, 3 deletions
diff --git a/Rules.modular b/Rules.modular
index 331a979de..e84371949 100644
--- a/Rules.modular
+++ b/Rules.modular
@@ -5,7 +5,7 @@
all_modules := $(base_mods) $(mod_mods) $(off_mods)
all_interfaces := $(all_modules:.te=.if)
-all_mod_fc := $(addprefix $(tmpdir)/,$(notdir $(all_modules:.te=.mod.fc)))
+enabled_mod_fc := $(addprefix $(tmpdir)/,$(notdir $(base_mods:.te=.mod.fc) $(mod_mods:.te=.mod.fc)))
base_pkg := $(builddir)base.pp
base_fc := $(builddir)base.fc
@@ -31,7 +31,7 @@ vpath %.te $(all_layers)
vpath %.if $(all_layers)
vpath %.fc $(all_layers)
-.SECONDARY: $(all_mod_fc:.mod.fc=.mod) $(all_mod_fc)
+.SECONDARY: $(enabled_mod_fc:.mod.fc=.mod) $(enabled_mod_fc)
########################################
#
@@ -86,7 +86,7 @@ $(builddir)%.pp: $(tmpdir)/%.mod $(tmpdir)/%.mod.fc
@test -d $(builddir) || mkdir -p $(builddir)
$(verbose) $(SEMOD_PKG) -o $@ -m $< -f $<.fc
-$(tmpdir)/all_mods.fc: $(all_mod_fc)
+$(tmpdir)/all_mods.fc: $(enabled_mod_fc)
$(verbose) cat $^ > $@
########################################