From 905fb5b58b31d2864c9804f42614c354f1446970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Sun, 10 Nov 2024 15:19:18 +0100
Subject: [PATCH] build: drop obsolete setfiles option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@googlemail.com>
---
 Rules.modular    | 2 +-
 Rules.monolithic | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rules.modular b/Rules.modular
index 12f4db02cd..23cf7fbffa 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 2cbee5a177..d82166a7b5 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."