From 1eadd44de33b2884ba77be4b3ab1c312197fefd4 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sep 06 2024 16:02:04 +0000
Subject: Sync c10s and eln changes


---

diff --git a/prepopulate.json b/prepopulate.json
index c938bcf..dca8d1b 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -214,9 +214,6 @@
         "atk-devel.aarch64",
         "atk.aarch64"
       ],
-      "atinject": [
-        "atinject.noarch"
-      ],
       "attr": [
         "libattr-devel.aarch64"
       ],
@@ -379,9 +376,6 @@
       "cairomm1.16": [
         "cairomm1.16.aarch64"
       ],
-      "cdi-api": [
-        "cdi-api.noarch"
-      ],
       "ceph": [
         "librados2.aarch64",
         "librbd1.aarch64"
@@ -2090,6 +2084,12 @@
       "jakarta-annotations": [
         "jakarta-annotations.noarch"
       ],
+      "jakarta-cdi2.0": [
+        "jakarta-cdi2.0.noarch"
+      ],
+      "jakarta-inject1.0": [
+        "jakarta-inject1.0.noarch"
+      ],
       "jakarta-mail": [
         "jakarta-mail.noarch"
       ],
@@ -2993,9 +2993,6 @@
         "libnotify-devel.aarch64",
         "libnotify.aarch64"
       ],
-      "libnsl2": [
-        "libnsl2.aarch64"
-      ],
       "libogg": [
         "libogg.aarch64"
       ],
@@ -6753,9 +6750,6 @@
         "atk-devel.ppc64le",
         "atk.ppc64le"
       ],
-      "atinject": [
-        "atinject.noarch"
-      ],
       "attr": [
         "libattr-devel.ppc64le"
       ],
@@ -6922,9 +6916,6 @@
       "cairomm1.16": [
         "cairomm1.16.ppc64le"
       ],
-      "cdi-api": [
-        "cdi-api.noarch"
-      ],
       "ceph": [
         "librados2.ppc64le",
         "librbd1.ppc64le"
@@ -8600,6 +8591,12 @@
       "jakarta-annotations": [
         "jakarta-annotations.noarch"
       ],
+      "jakarta-cdi2.0": [
+        "jakarta-cdi2.0.noarch"
+      ],
+      "jakarta-inject1.0": [
+        "jakarta-inject1.0.noarch"
+      ],
       "jakarta-mail": [
         "jakarta-mail.noarch"
       ],
@@ -9494,9 +9491,6 @@
         "libnotify-devel.ppc64le",
         "libnotify.ppc64le"
       ],
-      "libnsl2": [
-        "libnsl2.ppc64le"
-      ],
       "libocxl": [
         "libocxl.ppc64le"
       ],
@@ -13203,9 +13197,6 @@
         "atk-devel.s390x",
         "atk.s390x"
       ],
-      "atinject": [
-        "atinject.noarch"
-      ],
       "attr": [
         "libattr-devel.s390x"
       ],
@@ -13366,9 +13357,6 @@
       "cairomm1.16": [
         "cairomm1.16.s390x"
       ],
-      "cdi-api": [
-        "cdi-api.noarch"
-      ],
       "ceph": [
         "librados2.s390x",
         "librbd1.s390x"
@@ -15014,6 +15002,12 @@
       "jakarta-annotations": [
         "jakarta-annotations.noarch"
       ],
+      "jakarta-cdi2.0": [
+        "jakarta-cdi2.0.noarch"
+      ],
+      "jakarta-inject1.0": [
+        "jakarta-inject1.0.noarch"
+      ],
       "jakarta-mail": [
         "jakarta-mail.noarch"
       ],
@@ -15910,9 +15904,6 @@
         "libnotify-devel.s390x",
         "libnotify.s390x"
       ],
-      "libnsl2": [
-        "libnsl2.s390x"
-      ],
       "libogg": [
         "libogg.s390x"
       ],
@@ -19643,9 +19634,6 @@
         "atk-devel.x86_64",
         "atk.x86_64"
       ],
-      "atinject": [
-        "atinject.noarch"
-      ],
       "attr": [
         "libattr-devel.x86_64"
       ],
@@ -19812,9 +19800,6 @@
       "cairomm1.16": [
         "cairomm1.16.x86_64"
       ],
-      "cdi-api": [
-        "cdi-api.noarch"
-      ],
       "ceph": [
         "librados2.x86_64",
         "librbd1.x86_64"
@@ -21541,6 +21526,12 @@
       "jakarta-annotations": [
         "jakarta-annotations.noarch"
       ],
+      "jakarta-cdi2.0": [
+        "jakarta-cdi2.0.noarch"
+      ],
+      "jakarta-inject1.0": [
+        "jakarta-inject1.0.noarch"
+      ],
       "jakarta-mail": [
         "jakarta-mail.noarch"
       ],
@@ -22452,9 +22443,6 @@
         "libnotify-devel.x86_64",
         "libnotify.x86_64"
       ],
-      "libnsl2": [
-        "libnsl2.x86_64"
-      ],
       "libogg": [
         "libogg.x86_64"
       ],
@@ -33059,9 +33047,6 @@
       "libnma": [
         "libnma-devel.aarch64"
       ],
-      "libnsl2": [
-        "libnsl2-devel.aarch64"
-      ],
       "libogg": [
         "libogg-devel-docs.noarch",
         "libogg-devel.aarch64"
@@ -34780,9 +34765,6 @@
       "libnma": [
         "libnma-devel.ppc64le"
       ],
-      "libnsl2": [
-        "libnsl2-devel.ppc64le"
-      ],
       "libocxl": [
         "libocxl-devel.ppc64le"
       ],
@@ -35881,6 +35863,9 @@
       "xorg-x11-server": [
         "xorg-x11-server-devel.ppc64le"
       ],
+      "xorg-x11-util-macros": [
+        "xorg-x11-util-macros.noarch"
+      ],
       "yajl": [
         "yajl-devel.ppc64le"
       ],
@@ -36559,9 +36544,6 @@
       "libnma": [
         "libnma-devel.s390x"
       ],
-      "libnsl2": [
-        "libnsl2-devel.s390x"
-      ],
       "libogg": [
         "libogg-devel-docs.noarch",
         "libogg-devel.s390x"
@@ -37653,6 +37635,9 @@
       "xorg-x11-server": [
         "xorg-x11-server-devel.s390x"
       ],
+      "xorg-x11-util-macros": [
+        "xorg-x11-util-macros.noarch"
+      ],
       "yajl": [
         "yajl-devel.s390x"
       ],
@@ -38354,9 +38339,6 @@
       "libnma": [
         "libnma-devel.x86_64"
       ],
-      "libnsl2": [
-        "libnsl2-devel.x86_64"
-      ],
       "libogg": [
         "libogg-devel-docs.noarch",
         "libogg-devel.x86_64"
@@ -39507,6 +39489,9 @@
       "xorg-x11-server": [
         "xorg-x11-server-devel.x86_64"
       ],
+      "xorg-x11-util-macros": [
+        "xorg-x11-util-macros.noarch"
+      ],
       "yajl": [
         "yajl-devel.x86_64"
       ],
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 9981596..c4a2ae3 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -351,6 +351,11 @@ additional_packages = [
             "sysprof", #ENGCMP-4325
             "sysprof-agent", #ENGCMP-4325
             "sysprof-cli", #ENGCMP-4325
+            "sequoia-sqv", #ENGCMP-4405
+            "sequoia-sq", #ENGCMP-4410
+            "yggdrasil", #ENGCMP-4382
+            "yggdrasil-worker-package-manager", #ENGCMP-4383
+            "python3-tpm2-pytss", #ENGCMP-4395
         ]
     }),
     ("^AppStream$", {