sort to get all attribute declarations above type declarations.

diff --git a/refpolicy/Rules.modular b/refpolicy/Rules.modular
index 74f1552592828d7d4034e9e0be94a3012c83f390..18ec40b4262de741ae862201a7d0877dde8e6b4a 100644 (file)
--- a/refpolicy/Rules.modular
+++ b/refpolicy/Rules.modular
@@ -166,7 +166,7 @@ $(TMPDIR)/post_te_files.conf: $(M4SUPPORT) $(BASE_POST_TE_FILES)
 # extract attributes and put them first. extract post te stuff
 # like genfscon and put last.
 $(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
-       $(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf > $(TMPDIR)/all_attrs_types.conf
+       $(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | sort > $(TMPDIR)/all_attrs_types.conf
        $(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
 # these have to run individually because order matters:
        $(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true

diff --git a/refpolicy/Rules.monolithic b/refpolicy/Rules.monolithic
index b40779a2afa2b8c578b49925e9331b825f3b93e4..fa8a9f9fe8088eb2e0a8e44f5aaff0007a243412 100644 (file)
--- a/refpolicy/Rules.monolithic
+++ b/refpolicy/Rules.monolithic
@@ -142,7 +142,7 @@ $(TMPDIR)/post_te_files.conf: $(M4SUPPORT) $(POST_TE_FILES)
 # extract attributes and put them first. extract post te stuff
 # like genfscon and put last.
 $(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
-       $(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf > $(TMPDIR)/all_attrs_types.conf
+       $(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | sort > $(TMPDIR)/all_attrs_types.conf
        $(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
 # these have to run individually because order matters:
        $(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true