diff options
| author |   Chris PeBenito <chpebeni@linux.microsoft.com> | 2020-07-10 09:07:52 -0400 |
|---|---|---|
| committer |   Jason Zaman <perfinion@gentoo.org> | 2020-08-09 19:58:46 -0700 |
| commit | f9b2881c8361e78c78c8dda12fb2c75d409022c7 (patch) | |
| tree | 9baa960b3cd4199ea29461e63345d5530b094139 /Rules.modular | |
| parent | openvpn: Module version bump. (diff) | |
| download | hardened-refpolicy-f9b2881c8361e78c78c8dda12fb2c75d409022c7.tar.gz hardened-refpolicy-f9b2881c8361e78c78c8dda12fb2c75d409022c7.tar.bz2 hardened-refpolicy-f9b2881c8361e78c78c8dda12fb2c75d409022c7.zip | |
Move user definitions to the right place during compilation.
This will allow user definitions in modules to work for monolithic policies
and base module.
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Diffstat (limited to 'Rules.modular')
| -rw-r--r-- | Rules.modular | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Rules.modular b/Rules.modular index 2552aee9c..ea234daef 100644 --- a/Rules.modular +++ b/Rules.modular @@ -154,9 +154,10 @@ endif $(verbose) $(M4) $(M4PARAM) -s $^ > $@ $(tmpdir)/post_te_files.conf: M4PARAM += -D self_contained_policy -$(tmpdir)/post_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(base_post_te_files) +$(tmpdir)/post_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(base_post_te_files) $(tmpdir)/all_te_files.conf @test -d $(tmpdir) || mkdir -p $(tmpdir) - $(verbose) $(M4) $(M4PARAM) $^ > $@ + $(verbose) $(GREP) '^[[:blank:]]*user ' $(tmpdir)/all_te_files.conf > $@ || true + $(verbose) $(M4) $(M4PARAM) $(m4support) $(tmpdir)/generated_definitions.conf $(base_post_te_files) >> $@ # extract attributes and put them first. extract post te stuff # like genfscon and put last. |