From 1ec1f1ace619e42a5d184b669a2a0e82712fd7cc Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Aug 06 2024 16:51:36 +0000
Subject: Consolidate kernel packages


---

diff --git a/prepopulate.json b/prepopulate.json
index 6308c7d..c59492b 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -26926,18 +26926,22 @@
       "kernel": [
         "kernel-64k-core.aarch64",
         "kernel-64k-debug-core.aarch64",
+        "kernel-64k-debug-modules-core.aarch64",
         "kernel-64k-debug-modules-extra.aarch64",
         "kernel-64k-debug-modules.aarch64",
         "kernel-64k-debug.aarch64",
+        "kernel-64k-modules-core.aarch64",
         "kernel-64k-modules-extra.aarch64",
         "kernel-64k-modules.aarch64",
         "kernel-64k.aarch64",
         "kernel-abi-stablelists.noarch",
         "kernel-core.aarch64",
         "kernel-debug-core.aarch64",
+        "kernel-debug-modules-core.aarch64",
         "kernel-debug-modules-extra.aarch64",
         "kernel-debug-modules.aarch64",
         "kernel-debug.aarch64",
+        "kernel-modules-core.aarch64",
         "kernel-modules-extra.aarch64",
         "kernel-modules.aarch64",
         "kernel-tools-libs.aarch64",
@@ -28498,9 +28502,11 @@
         "kernel-abi-stablelists.noarch",
         "kernel-core.ppc64le",
         "kernel-debug-core.ppc64le",
+        "kernel-debug-modules-core.ppc64le",
         "kernel-debug-modules-extra.ppc64le",
         "kernel-debug-modules.ppc64le",
         "kernel-debug.ppc64le",
+        "kernel-modules-core.ppc64le",
         "kernel-modules-extra.ppc64le",
         "kernel-modules.ppc64le",
         "kernel-tools-libs.ppc64le",
@@ -30052,13 +30058,16 @@
         "kernel-abi-stablelists.noarch",
         "kernel-core.s390x",
         "kernel-debug-core.s390x",
+        "kernel-debug-modules-core.s390x",
         "kernel-debug-modules-extra.s390x",
         "kernel-debug-modules.s390x",
         "kernel-debug.s390x",
+        "kernel-modules-core.s390x",
         "kernel-modules-extra.s390x",
         "kernel-modules.s390x",
         "kernel-tools.s390x",
         "kernel-zfcpdump-core.s390x",
+        "kernel-zfcpdump-modules-core.s390x",
         "kernel-zfcpdump-modules-extra.s390x",
         "kernel-zfcpdump-modules.s390x",
         "kernel-zfcpdump.s390x",
@@ -31624,13 +31633,17 @@
         "kernel-abi-stablelists.noarch",
         "kernel-core.x86_64",
         "kernel-debug-core.x86_64",
+        "kernel-debug-modules-core.x86_64",
         "kernel-debug-modules-extra.x86_64",
         "kernel-debug-modules.x86_64",
+        "kernel-debug-uki-virt.x86_64",
         "kernel-debug.x86_64",
+        "kernel-modules-core.x86_64",
         "kernel-modules-extra.x86_64",
         "kernel-modules.x86_64",
         "kernel-tools-libs.x86_64",
         "kernel-tools.x86_64",
+        "kernel-uki-virt.x86_64",
         "kernel.x86_64",
         "python3-perf.x86_64"
       ],
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index c3aee52..44abb5b 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -62,8 +62,6 @@ additional_packages = [
             "rhel-net-naming-sysattrs", #ENGCMP-3784
             "subscription-manager-cockpit", #ENGCMP-2427
             "subscription-manager-rhsm-certificates", #ENGCMP-2357
-            "kernel-modules-core", #ENGCMP-2899
-            "kernel-debug-modules-core", #ENGCMP-2899
             "kdump-utils", #ENGCMP-4007
             "makedumpfile", #ENGCMP-4007
             "libcpuid", #ENGCMP-4068
@@ -75,25 +73,12 @@ additional_packages = [
     }),
     ("^BaseOS$", {
          "aarch64": [
-            "kernel-64k", #ENGCMP-2800
-            "kernel-64k-core", #ENGCMP-2800
-            "kernel-64k-debug", #ENGCMP-2800
-            "kernel-64k-debug-core", #ENGCMP-2800
-            "kernel-64k-debug-modules", #ENGCMP-2800
-            "kernel-64k-debug-modules-core", #ENGCMP-2899, ENGCMP-2800
-            "kernel-64k-debug-modules-extra", #ENGCMP-2800
-            "kernel-64k-modules", #ENGCMP-2800
-            "kernel-64k-modules-extra", #ENGCMP-2800
-            "kernel-64k-modules-core", #ENGCMP-2899, ENGCMP-2800
          ],
          "ppc64le": [
          ],
          "x86_64": [
-            "kernel-uki-virt", #ENGCMP-2899
-            "kernel-debug-uki-virt", #ENGCMP-2899
          ],
          "s390x": [
-            "kernel-zfcpdump-modules-core",
          ],
      }),
     ("^AppStream$", {
@@ -412,10 +397,6 @@ additional_packages = [
          ],
          "aarch64": [
              "virt-dib",
-             "kernel-64k-debug-devel", #ENGCMP-2800
-             "kernel-64k-debug-devel-matched", #ENGCMP-2800
-             "kernel-64k-devel", #ENGCMP-2800
-             "kernel-64k-devel-matched", #ENGCMP-2800
              "rhc-worker-playbook", #ENGCMP-3127
              "s390utils", #ENGCMP-3606
              "libhwasan", #ENGCMP-4019