diff options
| author |   Christian Göttsche <cgzones@googlemail.com> | 2019-10-01 20:24:29 +0200 |
|---|---|---|
| committer |   Jason Zaman <perfinion@gentoo.org> | 2019-12-16 21:08:38 +0800 |
| commit | e75ed312e144c49603589e04986b47dcf23d290a (patch) | |
| tree | f02ab8a08a8499b9023917fae44c8551e0b4b258 /Makefile | |
| parent | .travis.yml: check the .fc files in CI (diff) | |
| download | hardened-refpolicy-e75ed312e144c49603589e04986b47dcf23d290a.tar.gz hardened-refpolicy-e75ed312e144c49603589e04986b47dcf23d290a.tar.bz2 hardened-refpolicy-e75ed312e144c49603589e04986b47dcf23d290a.zip | |
fix Makefile for policy-module directories with same ending
Currently policy module directories must have a same ending.
Reproduce with:
mv policy/modules/admin/ policy/modules/adminapps
make conf
Results in:
...
cat policy/modules/adminapps/metadata.xml policy/modules/apps/metadata.xml > tmp/apps.xml
...
doc/policy.xml:4332: element layer: validity error : Element layer content does not follow the DTD, expecting (summary , module+), got (summary summary module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module module )
Document doc/policy.xml does not validate against doc/policy.dtd
make: *** [Makefile:452: doc/policy.xml] Error 3
Add a leading slash to the filter pattern, to not match partial names
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -429,7 +429,7 @@ endif $(layerxml): %.xml: $(tmpdir)/iftemplates $(all_metaxml) $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods)) $(subst .te,.if, $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods))) @test -d $(tmpdir) || mkdir -p $(tmpdir) - $(verbose) cat $(filter %$(notdir $*)/$(metaxml), $(all_metaxml)) > $@ + $(verbose) cat $(filter %/$(notdir $*)/$(metaxml), $(all_metaxml)) > $@ $(verbose) for i in $(basename $(filter $(addprefix $(moddir)/, $(notdir $*))%, $(detected_mods))); do $(genxml) -w -T $(tmpdir)/iftemplates -m $$i >> $@; done ifdef LOCAL_ROOT $(verbose) for i in $(basename $(filter $(addprefix $(local_moddir)/, $(notdir $*))%, $(detected_mods))); do $(genxml) -w -T $(tmpdir)/iftemplates -m $$i >> $@; done |