From 67bef3ff74631c5cf7a04cf3d7f0d46be221287e Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 10 Nov 2024 20:11:05 -0700
Subject: [PATCH] sync from upstream

---
 prepopulate.json                           | 1 -
 prepopulate.yaml                           | 1 -
 shared/additional_and_filter_packages.conf | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index 7f83791..eb1304f 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -30178,7 +30178,6 @@
         "nvmetcli.noarch"
       ],
       "opencryptoki": [
-        "opencryptoki-ccatok.s390x",
         "opencryptoki-ep11tok.s390x",
         "opencryptoki-icatok.s390x",
         "opencryptoki-icsftok.s390x",
diff --git a/prepopulate.yaml b/prepopulate.yaml
index fbf7b42..53e7f58 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -23437,7 +23437,6 @@ BaseOS:
     nvmetcli:
     - nvmetcli.noarch
     opencryptoki:
-    - opencryptoki-ccatok.s390x
     - opencryptoki-ep11tok.s390x
     - opencryptoki-icatok.s390x
     - opencryptoki-icsftok.s390x
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index b38e788..0614f18 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -99,6 +99,7 @@ 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$", {