From d9617dd8ff64e4e21a05a9bc60b109d46a65d9a6 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 1 Dec 2024 17:59:25 -0700
Subject: [PATCH] sync from upstream

---
 shared/additional_and_filter_packages.conf | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 5420d37..aa8326c 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -99,7 +99,6 @@ additional_packages = [
             "python3-libcpuid", #ENGCMP-4447
             "python3-dnf-plugin-pre-transaction-actions", #ENGCMP-4445
             "kernel-uki-virt-addons", #ENGCMP-4617
-            "opencryptoki-ccatok", #ENGCMP-4704
         ]
     }),
     ("^BaseOS$", {
@@ -116,14 +115,17 @@ additional_packages = [
             "kernel-64k-modules-core", #ENGCMP-2899, ENGCMP-2800
          ],
          "ppc64le": [
+            "opencryptoki-ccatok", #ENGCMP-4704
          ],
          "x86_64": [
             "kernel-uki-virt", #ENGCMP-2899
             "kernel-debug-uki-virt", #ENGCMP-2899
+            "opencryptoki-ccatok", #ENGCMP-4704
          ],
          "s390x": [
             "kernel-zfcpdump-modules-core",
             "libibverbs-utils", #ENGCMP-3507
+            "opencryptoki-ccatok", #ENGCMP-4704
          ],
      }),
     ("^AppStream$", {
@@ -246,8 +248,6 @@ additional_packages = [
             "libkdumpfile", #ENGCMP-3470
             "libnvme", #ENGCMP-2358
             "libnxz", #ENGCMP-2576
-            "libomp", #ENGCMP-4820
-            "libomp-devel", #ENGCMP-4820
             "libsepol-utils", #ENGCMP-2399
             "libtsan2", #ENGCMP-2405
             "libvirt-daemon-common", # ENGCMP-3046
@@ -535,6 +535,7 @@ additional_packages = [
             "dotnet-templates-9.0", #ENGCMP-4413
             "crypto-policies-pq-preview", #ENGCMP-4665
             "clevis-pin-pkcs11", #ENGCMP-4702
+            "systemtap-sdt-dtrace", #ENGCMP-4860
         ]
     }),
     ("^AppStream$", {
@@ -549,6 +550,7 @@ additional_packages = [
              "libgomp-offload-amdgcn", #ENGCMP-4019
              "qat-zstd-plugin", #ENGCMP-4723
              "qat-zstd-plugin-devel", #ENGCMP-4723
+             "command-line-assistant", #ENGCMP-4910
          ],
          "aarch64": [
              "virt-dib",
@@ -559,6 +561,7 @@ additional_packages = [
              "rhc-worker-playbook", #ENGCMP-3127
              "s390utils", #ENGCMP-3606
              "libhwasan", #ENGCMP-4019
+             "command-line-assistant", #ENGCMP-4910
          ],
          "s390x": [
              "libzpc", #ENGCMP-2756