From d233bfce3fa1177bbfa3437d85db6f9db5fdc0bd Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Wed, 29 Jun 2005 16:54:13 +0000
Subject: [PATCH] make layer summary required

---
 refpolicy/Makefile                             | 5 ++++-
 refpolicy/doc/policy.dtd                       | 2 +-
 refpolicy/policy/modules/admin/metadata.xml    | 3 +++
 refpolicy/policy/modules/apps/metadata.xml     | 1 +
 refpolicy/policy/modules/kernel/metadata.xml   | 1 +
 refpolicy/policy/modules/services/metadata.xml | 4 ++++
 refpolicy/policy/modules/system/metadata.xml   | 3 +++
 7 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/refpolicy/Makefile b/refpolicy/Makefile
index bc1c4749..d6749467 100644
--- a/refpolicy/Makefile
+++ b/refpolicy/Makefile
@@ -306,6 +306,9 @@ enableaudit: policy.conf
 # Construct file_contexts
 #
 $(FC): $(M4SUPPORT) tmp/generated_definitions.conf $(ALL_FC_FILES) $(FCSORT)
+ifeq ($(ALL_FC_FILES),)
+	$(error No enabled modules! $(notdir $(MOD_CONF)) may need to be generated by using "make conf")
+endif
 	@test -d tmp || mkdir -p tmp
 	$(QUIET) m4 $(M4PARAM) $(M4SUPPORT) tmp/generated_definitions.conf $(ALL_FC_FILES) > tmp/$@.tmp
 	$(QUIET) grep -e HOME -e ROLE tmp/$@.tmp > $(HOMEDIR_TEMPLATE)
@@ -368,7 +371,7 @@ $(MOD_CONF) $(TUNABLES): $(POLXML)
 # this and its dependents every time the dependencies
 # change.  Also use all .if files here, rather then just the
 # enabled modules.
-$(POLXML): $(DETECTED_MODS:.te=.if)
+$(POLXML): $(DETECTED_MODS:.te=.if) $(foreach dir,$(ALL_LAYERS),$(dir)/$(LAYERXML))
 	@echo "Creating $@"
 	@mkdir -p tmp
 	$(QUIET) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@
diff --git a/refpolicy/doc/policy.dtd b/refpolicy/doc/policy.dtd
index 801e57fe..166f8279 100644
--- a/refpolicy/doc/policy.dtd
+++ b/refpolicy/doc/policy.dtd
@@ -1,7 +1,7 @@
 <!ENTITY  % inline.class  "pre|p|ul|li">
 
 <!ELEMENT policy (layer+,tunable*)>
-<!ELEMENT layer (module+)>
+<!ELEMENT layer (summary,module+)>
 <!ATTLIST layer
       name CDATA #REQUIRED>
 <!ELEMENT module (summary,desc?,(interface|template)*)>
diff --git a/refpolicy/policy/modules/admin/metadata.xml b/refpolicy/policy/modules/admin/metadata.xml
index e69de29b..bd8d1747 100644
--- a/refpolicy/policy/modules/admin/metadata.xml
+++ b/refpolicy/policy/modules/admin/metadata.xml
@@ -0,0 +1,3 @@
+<summary>
+	Policy modules for administrative functions, such as package management.
+</summary>
diff --git a/refpolicy/policy/modules/apps/metadata.xml b/refpolicy/policy/modules/apps/metadata.xml
index e69de29b..a5ad4c0e 100644
--- a/refpolicy/policy/modules/apps/metadata.xml
+++ b/refpolicy/policy/modules/apps/metadata.xml
@@ -0,0 +1 @@
+<summary>Policy modules for applications</summary>
diff --git a/refpolicy/policy/modules/kernel/metadata.xml b/refpolicy/policy/modules/kernel/metadata.xml
index e69de29b..d1da3a2f 100644
--- a/refpolicy/policy/modules/kernel/metadata.xml
+++ b/refpolicy/policy/modules/kernel/metadata.xml
@@ -0,0 +1 @@
+<summary>Policy modules for kernel resources.</summary>
diff --git a/refpolicy/policy/modules/services/metadata.xml b/refpolicy/policy/modules/services/metadata.xml
index e69de29b..4e6ec175 100644
--- a/refpolicy/policy/modules/services/metadata.xml
+++ b/refpolicy/policy/modules/services/metadata.xml
@@ -0,0 +1,4 @@
+<summary>
+	Policy modules for system services, like cron, and network services,
+	like sshd.
+</summary>
diff --git a/refpolicy/policy/modules/system/metadata.xml b/refpolicy/policy/modules/system/metadata.xml
index e69de29b..4866e979 100644
--- a/refpolicy/policy/modules/system/metadata.xml
+++ b/refpolicy/policy/modules/system/metadata.xml
@@ -0,0 +1,3 @@
+<summary>
+	Policy modules for system functions from init to multi-user login.
+</summary>