Only include SELinux when the SELinux flavor is used

This avoids pulling in unnecessary dependencies, fixes the R4.1 build, and allows using SELinux on CentOS Stream later.
QubesOS · Feb 5, 2023 · 7a2420a · 7a2420a
1 parent 0e3af1d
commit 7a2420a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/template_rpm/09_cleanup.sh b/template_rpm/09_cleanup.sh
@@ -51,8 +51,7 @@ fi
 
 truncate --no-create --size=0 "${INSTALL_DIR}"/var/log/dnf.*
 
-if [[ "$DIST_NAME" = 'fedora' ]] && [[ "$DIST_VER" -ge 37 ]] &&
-    chroot -- "$INSTALL_DIR" rpm -qv qubes-core-agent-selinux; then
+if containsFlavor selinux; then
     sed -i -- 's/^SELINUX=\(disabled\|enforcing\)/SELINUX=permissive/' "$INSTALL_DIR/etc/selinux/config"
     unshare --mount -- chroot -- "$INSTALL_DIR" /bin/sh -euc 'mount --bind -- / /mnt
         umask 0755

diff --git a/template_rpm/packages_fedora_minimal.list b/template_rpm/packages_fedora_minimal.list
@@ -1,7 +1,6 @@
 xterm
 tar
 haveged
-selinux-policy-targeted
 sudo
 --exclude=kdegames
 --exclude=firstboot