Skip to content

Commit

Permalink
build: drop obsolete setfiles option
Browse files Browse the repository at this point in the history
The option -q has no effect anymore, see
https://github.com/SELinuxProject/selinux/blob/3.7/policycoreutils/setfiles/setfiles.c#L312-L316

Signed-off-by: Christian Göttsche <[email protected]>
  • Loading branch information
cgzones committed Nov 10, 2024
1 parent 4938b79 commit 905fb5b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Rules.modular
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ validate: $(base_pkg) $(mod_pkgs) $(tmpdir)/all_mods.fc $(builtappfiles)
$(verbose) $(SEMOD_LNK) -o $(tmpdir)/test.lnk $(base_pkg) $(mod_pkgs)
$(verbose) $(SEMOD_EXP) $(tmpdir)/test.lnk $(tmpdir)/policy.bin
@echo "Validating $(NAME) file contexts."
$(verbose) $(SETFILES) -q -c $(tmpdir)/policy.bin $(tmpdir)/all_mods.fc
$(verbose) $(SETFILES) -c $(tmpdir)/policy.bin $(tmpdir)/all_mods.fc
@echo "Validating $(NAME) appconfig."
$(verbose) $(validateappconfig) $(builtappconf) $(tmpdir)/policy.bin
@echo "Success."
Expand Down
4 changes: 2 additions & 2 deletions Rules.monolithic
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ $(homedir_template): $(fc)
#
$(fcpath): $(fc) $(loadpath) $(userpath)/system.users
@echo "Validating $(NAME) file_contexts."
$(verbose) $(SETFILES) -q -c $(loadpath) $(fc)
$(verbose) $(SETFILES) -c $(loadpath) $(fc)
@echo "Installing file_contexts."
@$(INSTALL) -d -m 0755 $(@D)
$(verbose) $(INSTALL) -m 0644 $(fc) $(fcpath)
Expand All @@ -247,7 +247,7 @@ $(fcpath): $(fc) $(loadpath) $(userpath)/system.users
#
validate: $(fc) $(polver) $(builtappfiles)
@echo "Validating $(NAME) file_contexts."
$(verbose) $(SETFILES) -q -c $(polver) $(fc)
$(verbose) $(SETFILES) -c $(polver) $(fc)
@echo "Validating $(NAME) appconfig."
$(verbose) $(validateappconfig) $(builtappconf) $(polver)
@echo "Success."
Expand Down

0 comments on commit 905fb5b

Please sign in to comment.