From 01ba068318ee0bd4f0cc5f5bff4f23c15cf95fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 7 Jul 2022 15:25:44 +0200
Subject: [PATCH] Move systemd-oomd-defaults into specific environment groups

It is removed from @core, and added to @cloud-server, @gnome-desktop,
@kde-desktop, @server-product, @workstation-product instead.

My understanding is that both KDE and GNOME use cgroups and work
nicely with systemd-oomd, and cloud and server should be fine with it
too. The environments that use those groups previously included
systemd-oomd-defaults from @core, so this change should not add
systemd-oomd-defaults to anything, but remove it from the groups and
environments that don't include the five groups that now reference it.

Fixes https://pagure.io/fedora-comps/issue/737.

Not tested.
---
 comps-f36.xml.in | 6 +++++-
 comps-f37.xml.in | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index d7efea37..d001e0ea 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -546,6 +546,7 @@
       <packagereq type="default">console-login-helper-messages-motdgen</packagereq>
       <packagereq type="default">console-login-helper-messages-profile</packagereq>
       <packagereq type="default">fedora-release-cloud</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
     </packagelist>
   </group>
   <group>
@@ -637,7 +638,6 @@
       <packagereq type="default">plymouth</packagereq>
       <packagereq arch="ppc64le" type="default">powerpc-utils</packagereq>
       <packagereq arch="s390x" type="default">s390utils-base</packagereq>
-      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">systemd-resolved</packagereq>
       <packagereq type="default">zram-generator-defaults</packagereq>
       <packagereq type="optional">dracut-config-generic</packagereq>
@@ -2627,6 +2627,7 @@
       <packagereq type="default">sane-backends-drivers-scanners</packagereq>
       <packagereq type="default">simple-scan</packagereq>
       <packagereq type="default">sushi</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">totem</packagereq>
       <packagereq type="default">tracker</packagereq>
       <packagereq type="default">tracker-miners</packagereq>
@@ -3286,6 +3287,7 @@
       <packagereq type="default">polkit-kde</packagereq>
       <packagereq type="default">qt5-qtdeclarative</packagereq>
       <packagereq type="default">spectacle</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput</packagereq>
       <packagereq type="optional">plasma-pk-updates</packagereq>
@@ -4939,6 +4941,7 @@
       <packagereq type="default">dhcp-client</packagereq>
       <packagereq type="default">fedora-release-server</packagereq>
       <packagereq type="default">NetworkManager-team</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5711,6 +5714,7 @@
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">sssd</packagereq>
       <packagereq type="default">symlinks</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">thermald</packagereq>
       <packagereq type="default">time</packagereq>
diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index 959af3b9..3b485bdd 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -543,6 +543,7 @@
       <packagereq type="default">console-login-helper-messages-motdgen</packagereq>
       <packagereq type="default">console-login-helper-messages-profile</packagereq>
       <packagereq type="default">fedora-release-cloud</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
     </packagelist>
   </group>
   <group>
@@ -634,7 +635,6 @@
       <packagereq type="default">plymouth</packagereq>
       <packagereq arch="ppc64le" type="default">powerpc-utils</packagereq>
       <packagereq arch="s390x" type="default">s390utils-base</packagereq>
-      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">systemd-resolved</packagereq>
       <packagereq type="default">zram-generator-defaults</packagereq>
       <packagereq type="optional">dracut-config-generic</packagereq>
@@ -2624,6 +2624,7 @@
       <packagereq type="default">sane-backends-drivers-scanners</packagereq>
       <packagereq type="default">simple-scan</packagereq>
       <packagereq type="default">sushi</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">totem</packagereq>
       <packagereq type="default">tracker</packagereq>
       <packagereq type="default">tracker-miners</packagereq>
@@ -3284,6 +3285,7 @@
       <packagereq type="default">polkit-kde</packagereq>
       <packagereq type="default">qt5-qtdeclarative</packagereq>
       <packagereq type="default">spectacle</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput</packagereq>
       <packagereq type="optional">plasma-pk-updates</packagereq>
@@ -4936,6 +4938,7 @@
       <packagereq type="default">dhcp-client</packagereq>
       <packagereq type="default">fedora-release-server</packagereq>
       <packagereq type="default">NetworkManager-team</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5707,6 +5710,7 @@
       <packagereq type="default">sos</packagereq>
       <packagereq type="default">sssd</packagereq>
       <packagereq type="default">symlinks</packagereq>
+      <packagereq type="default">systemd-oomd-defaults</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">thermald</packagereq>
       <packagereq type="default">time</packagereq>