From 2b74c54f6295ebfc7609daccfc4276df82412a57 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <pebenito@ieee.org>
Date: Sun, 6 Aug 2017 16:54:40 -0400
Subject: [PATCH] Rules.modular: Fix file context verification.

Disabled modules were included in the file contexts, resulting in false
verification errors.
---
 Rules.modular | 6 +++---
 1 file 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 $^ > $@
 
 ########################################