From 9d6087de55f4cd77106733f867c506c925095b7b Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 18 Nov 2024 18:05:52 -0700
Subject: [PATCH] sync from upstream

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

diff --git a/prepopulate.json b/prepopulate.json
index f01ab77..c3906a3 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -37530,7 +37530,6 @@
         "oniguruma.s390x"
       ],
       "opencryptoki": [
-        "opencryptoki-ccatok.s390x",
         "opencryptoki-ep11tok.s390x",
         "opencryptoki-icatok.s390x",
         "opencryptoki-icsftok.s390x",
@@ -52239,4 +52238,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/prepopulate.yaml b/prepopulate.yaml
index 6acaeca..a803036 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -29262,7 +29262,6 @@ BaseOS:
     oniguruma:
     - oniguruma.s390x
     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 9020001..aff29da 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -60,6 +60,7 @@ additional_packages = [
             "kernel-debug-modules-core", #ENGCMP-2899
             "ledmon-libs", #ENGCMP-4059
             "kernel-uki-virt-addons", #ENGCMP-4411
+            "opencryptoki-ccatok", #ENGCMP-4704
         ]
     }),
     ("^BaseOS$", {