sync from upstream

2024-11-23 05:11:25 +00:00 · 2024-11-18 18:05:52 -07:00 · 2024-11-18 18:05:52 -07:00 · 9d6087de55
commit 9d6087de55
parent 02c1dc0981
3 changed files with 2 additions and 3 deletions
--- 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 @@
      ]
    }
  }
-}
+}
--- 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
--- 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$", {