From 7c863e59716f05123ae4467391c59704b322a544 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 19 Jun 2024 08:11:51 -0700
Subject: [PATCH] sync from upstream

---
 prepopulate.json                           | 12 ------------
 shared/additional_and_filter_packages.conf | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index 9230157..97df384 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -865,9 +865,6 @@
       "expect": [
         "expect.aarch64"
       ],
-      "fabtests": [
-        "fabtests.aarch64"
-      ],
       "fapolicyd": [
         "fapolicyd-selinux.noarch",
         "fapolicyd.aarch64"
@@ -8278,9 +8275,6 @@
       "expect": [
         "expect.ppc64le"
       ],
-      "fabtests": [
-        "fabtests.ppc64le"
-      ],
       "fapolicyd": [
         "fapolicyd-selinux.noarch",
         "fapolicyd.ppc64le"
@@ -15646,9 +15640,6 @@
       "expect": [
         "expect.s390x"
       ],
-      "fabtests": [
-        "fabtests.s390x"
-      ],
       "fapolicyd": [
         "fapolicyd-selinux.noarch",
         "fapolicyd.s390x"
@@ -22996,9 +22987,6 @@
       "expect": [
         "expect.x86_64"
       ],
-      "fabtests": [
-        "fabtests.x86_64"
-      ],
       "fapolicyd": [
         "fapolicyd-selinux.noarch",
         "fapolicyd.x86_64"
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 13557d1..31fd918 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -253,6 +253,7 @@ additional_packages = [
             "keylime-tenant", #ENGCMP-2419
             "keylime-verifier", #ENGCMP-2419
             "libadwaita", #ENGCMP-3651
+            "libarchive-devel", #ENGCMP-4182
             "libasan8", #ENGCMP-2405
             "libblkio", #ENGCMP-3149
             "libgpiod", #ENGCMP-2433
@@ -425,6 +426,14 @@ additional_packages = [
             "dotnet-sdk-dbg-8.0", #ENGCMP-4088
             "gnutls-fips", #ENGCMP-4092
             "libdisplay-info", #ENGCMP-4127
+            "valkey", #ENGCMP-4149
+            "valkey-devel", #ENGCMP-4149
+            "tpm2-openssl", #ENGCMP-4154
+            "pcm", #ENGCMP-4090
+            "amd-gpu-firmware", #ENGCMP-4150
+            "intel-gpu-firmware", #ENGCMP-4150
+            "nvidia-gpu-firmware", #ENGCMP-4150
+            "pkcs11-provider", #ENGCMP-4181
         ]
     }),
     ("^AppStream$", {
@@ -467,6 +476,7 @@ additional_packages = [
     ("^CRB$", {
         "*": [
              "dotnet-sdk-8.0-source-built-artifacts", #CS-2160
+             "fabtests", #ENGCMP-4168
          ],
         "x86_64": [
              "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327