commit:     c987ac860b951c79e68aa2be22fb5607979f5b77
Author:     Christian Göttsche <cgzones <AT> googlemail <DOT> com>
AuthorDate: Sun Nov 10 14:19:18 2024 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Sep  2 22:07:41 2025 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=c987ac86

build: drop obsolete setfiles option

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 <cgzones <AT> googlemail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 Rules.modular    | 2 +-
 Rules.monolithic | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rules.modular b/Rules.modular
index c705541ec..f7f68c611 100644
--- a/Rules.modular
+++ b/Rules.modular
@@ -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."

diff --git a/Rules.monolithic b/Rules.monolithic
index 2cbee5a17..d82166a7b 100644
--- a/Rules.monolithic
+++ b/Rules.monolithic
@@ -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)
@@ -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."

Reply via email to