From 8b26526a7ee21e92d43ad50ffec3d886acfcfb7d Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Apr 24 2024 18:27:30 +0000
Subject: [PATCH 1/3] comps-sync: Include optional groups from workstation-product-environment


Include optional comps groups from workstation-product-environment in
the common set of packages for all Atomic Desktops variants.

This notably includes the `domain-client` group.

Fixes: https://gitlab.com/fedora/ostree/sig/-/issues/24
Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/550
Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/320

---

diff --git a/comps-sync.py b/comps-sync.py
index 664a55f..cf3e3fa 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -187,6 +187,10 @@ def main():
         if gid.name in comps_exclude_list_groups:
             continue
         groups.append(gid.name)
+    for gid in comps.environments['workstation-product-environment'].option_ids:
+        if gid.name in comps_exclude_list_groups:
+            continue
+        groups.append(gid.name)
 
     # Always include the packages from the workstation-ostree-support group
     groups.append('workstation-ostree-support')

From efb54896cd07aa896e3287f5fe3c99924cbcf939 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Apr 24 2024 18:27:30 +0000
Subject: [PATCH 2/3] comps-sync-exclude-list.yml: Exclude arm-tools from common comps groups


---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 33fe3b3..6e2051a 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -6,6 +6,7 @@ exclude_list_groups:
   - gnome-desktop
   - container-management
   - base-x
+  - arm-tools
 
 # Always exclude packages matching those regexp:
 # - PackageKit is spread across various groups

From ea4098e2e8181c3767ffa05a1fa7cb2b9952adda Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Apr 24 2024 18:27:30 +0000
Subject: [PATCH 3/3] comps-sync f41 2024-04-12


See: https://gitlab.com/fedora/ostree/sig/-/issues/24

---

diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 75443cc..2fbb32b 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -6,6 +6,7 @@ packages:
   - NetworkManager-wifi
   - NetworkManager-wwan
   - acl
+  - adcli
   - alsa-ucm
   - alsa-utils
   - amd-gpu-firmware
@@ -66,6 +67,7 @@ packages:
   - firefox
   - firewalld
   - fpaste
+  - freeipa-client
   - fros-gnome
   - fwupd
   - gamemode
@@ -101,6 +103,8 @@ packages:
   - less
   - libertas-firmware
   - libglvnd-gles
+  - libsss_autofs
+  - libsss_sudo
   - linux-firmware
   - logrotate
   - lrzsz
@@ -118,6 +122,7 @@ packages:
   - ntfsprogs
   - nvidia-gpu-firmware
   - nxpwireless-firmware
+  - oddjob-mkhomedir
   - opensc
   - openssh-clients
   - openssh-server
@@ -152,6 +157,8 @@ packages:
   - rpm-ostree
   - rsync
   - samba-client
+  - samba-common-tools
+  - samba-winbind
   - selinux-policy-targeted
   - setup
   - shadow-utils
@@ -159,8 +166,11 @@ packages:
   - speech-dispatcher
   - spice-vdagent
   - spice-webdavd
+  - sssd-ad
   - sssd-common
+  - sssd-ipa
   - sssd-kcm
+  - sssd-nfs-idmap
   - sudo
   - system-config-printer-udev
   - systemd