PR#750: Move systemd-oomd-defaults into specific environment groups - fedora-comps

fedora-comps

#750 Move systemd-oomd-defaults into specific environment groups

Merged 2 years ago by kevin. Opened 2 years ago by zbyszek.

zbyszek/fedora-comps move-systemd-oomd-defaults into main

Move systemd-oomd-defaults into specific environment groups

Zbigniew Jędrzejewski-Szmek • 2 years ago

01ba068

comps-f36.xml.in

file modified

+5 -1

		`@@ -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>`

comps-f37.xml.in

file modified

+5 -1

		`@@ -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>`

zbyszek commented 2 years ago

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.

raveit65 commented 2 years ago

I think that will work.
I created a local MATE repository and renamed related groups and environment groups in comps-f36.xml from MR.
mate-desktop-environment --> mate-desktop-test-environment
mate-desktop --> mate-desktop-test
core --> core-test

And created a repo database with
createrepo_c --changelog-limit=3 --database -g /var/lib/mock/comps-f36.xml /var/lib/mock/fedora-36-x86_64-test

Now the groupinstall commmand works fine:

[root@f36 ~]# dnf groupinstall mate-desktop-test-environment
Last metadata expiration check: 0:01:56 ago on Mon Jul 11 22:06:28 2022.
No match for group package "s390utils-base"
No match for group package "fedora-release-matecompiz-test"
No match for group package "xorg-x11-drv-armsoc"
No match for group package "powerpc-utils"
No match for group package "lsvpd"
Dependencies resolved.
================================================================================
 Package           Architecture     Version             Repository         Size
================================================================================
Installing Environment Groups:
 <name-unset>                                                                  
Installing Groups:
 base-x                                                                        
 Standard                                                                      
 <name-unset>                                                                  
 Administration Tools

 Dial-up Networking Support

 Fonts                                                                         
 Input Methods                                                                 
 Multimedia                                                                    
 Common NetworkManager Submodules

 Hardware Support                                                              
 Printing Support                                                              
 Guest Desktop Agents

 <name-unset>                                                                  

Transaction Summary
================================================================================

Is this ok [y/N]: n
Operation aborted.

In oposite when using normal Mate group

[root@f36 ~]# dnf groupinstall mate-desktop-environment
Last metadata expiration check: 0:03:03 ago on Mon Jul 11 22:06:28 2022.
No match for group package "xorg-x11-drv-armsoc"
Dependencies resolved.

 Problem: package mate-desktop-1.26.0-5.fc36.x86_64 requires mate-desktop-configs = 1.26.0-5.fc36, but none of the providers can be installed
  - package mate-desktop-configs-1.26.0-5.fc36.noarch conflicts with systemd-oomd-defaults provided by systemd-oomd-defaults-250.7-1.fc36.noarch
  - cannot install the best candidate for the job
==================================================================================================================================
 Package                                 Architecture             Version                         Repository                 Size
==================================================================================================================================
Installing group/module packages:
 systemd-oomd-defaults                   noarch                   250.7-1.fc36                    updates                    26 k
Downgrading:
 mate-desktop                            x86_64                   1.26.0-3.fc36                   fedora                     82 k
 mate-desktop-configs                    noarch                   1.26.0-3.fc36                   fedora                     10 k
 mate-desktop-libs                       x86_64                   1.26.0-3.fc36                   fedora                    644 k
Installing Environment Groups:
 MATE Desktop                                                                                                                    
Installing Groups:
 Administration Tools                                                                                                            
 base-x                                                                                                                          
 Core                                                                                                                            
 Dial-up Networking Support                                                                                                      
 Fonts                                                                                                                           
 Guest Desktop Agents                                                                                                            
 Hardware Support                                                                                                                
 Input Methods                                                                                                                   
 MATE                                                                                                                            
 Multimedia                                                                                                                      
 Common NetworkManager Submodules                                                                                                
 Printing Support                                                                                                                
 Standard                                                                                                                        

Transaction Summary
==================================================================================================================================
Install    1 Package
Downgrade  3 Packages

Total download size: 763 k
Is this ok [y/N]: n
Operation aborted.

LGTM

Edited 2 years ago by raveit65

rebased onto 01ba068

2 years ago

kevin commented 2 years ago

ok, lets give it a try.

Pull-Request has been merged by kevin

2 years ago

raveit65 commented 2 years ago

How long does it take to see the change in f36 installation?
systemd-oomd-defaults is still there in core group after 12 days.

[root@mother rave]# dnf groupinfo core
Last metadata expiration check: 2:54:47 ago on Sun Jul 24 14:58:36 2022.
Group: Core
 Description: Smallest possible installation
 Mandatory Packages:
   audit
   basesystem

<cut>

 Default Packages:
   NetworkManager
   dnf-plugins-core
   dracut-config-rescue
   fedora-repos-modular
   firewalld
   fwupd
   plymouth
   systemd-oomd-defaults
   systemd-resolved
   zram-generator-defaults
 Optional Packages:
   dracut-config-generic

<cut>