manifests: includes kdump subpackages in f40

Kdump split out into subpackages in rawhide a while back [1]
But this split was just pushed to F40 as well with [2].

So we can remove the conditionnal includes and now always
include the subpackages.

[1] 437dc2a
[2] https://bodhi.fedoraproject.org/updates/FEDORA-2024-d70dfd026e

manifest-lock.ppc64le.json

@@ -1026,6 +1026,12 @@
         "sourcerpm": "kbd"
       }
     },
+    "kdump-utils": {
+      "evra": "1.0.42-10.fc40.ppc64le",
+      "metadata": {
+        "sourcerpm": "kdump-utils"
+      }
+    },
     "kernel": {
       "evra": "6.8.11-300.fc40.ppc64le",
       "metadata": {
@@ -1051,7 +1057,7 @@
       }
     },
     "kexec-tools": {
-      "evra": "2.0.28-4.fc40.ppc64le",
+      "evra": "2.0.28-10.fc40.ppc64le",
       "metadata": {
         "sourcerpm": "kexec-tools"
       }
@@ -1764,6 +1770,12 @@
         "sourcerpm": "lzo"
       }
     },
+    "makedumpfile": {
+      "evra": "1.7.5-11.fc40.ppc64le",
+      "metadata": {
+        "sourcerpm": "makedumpfile"
+      }
+    },
     "mdadm": {
       "evra": "4.2-8.fc40.ppc64le",
       "metadata": {

manifest-lock.s390x.json

@@ -991,7 +991,7 @@
       }
     },
     "kexec-tools": {
-      "evra": "2.0.28-4.fc40.s390x",
+      "evra": "2.0.28-10.fc40.s390x",
       "metadata": {
         "sourcerpm": "kexec-tools"
       }
@@ -1008,6 +1008,12 @@
         "sourcerpm": "keyutils"
       }
     },
+    "kdump-utils": {
+      "evra": "1.0.42-10.fc40.s390x",
+      "metadata": {
+        "sourcerpm": "kdump-utils"
+      }
+    },
     "kmod": {
       "evra": "31-5.fc40.s390x",
       "metadata": {
@@ -1692,6 +1698,12 @@
         "sourcerpm": "lzo"
       }
     },
+    "makedumpfile": {
+      "evra": "1.7.5-11.fc40.s390x",
+      "metadata": {
+        "sourcerpm": "makedumpfile"
+      }
+    },
     "mdadm": {
       "evra": "4.2-8.fc40.s390x",
       "metadata": {

manifest-lock.x86_64.json

@@ -1068,6 +1068,12 @@
         "sourcerpm": "kbd"
       }
     },
+    "kdump-utils": {
+      "evra": "1.0.42-10.fc40.x86_64",
+      "metadata": {
+        "sourcerpm": "kdump-utils"
+      }
+    },
     "kernel": {
       "evra": "6.8.11-300.fc40.x86_64",
       "metadata": {
@@ -1093,7 +1099,7 @@
       }
     },
     "kexec-tools": {
-      "evra": "2.0.28-4.fc40.x86_64",
+      "evra": "2.0.28-10.fc40.x86_64",
       "metadata": {
         "sourcerpm": "kexec-tools"
       }
@@ -1806,6 +1812,12 @@
         "sourcerpm": "lzo"
       }
     },
+    "makedumpfile": {
+      "evra": "1.7.5-11.fc40.x86_64",
+      "metadata": {
+        "sourcerpm": "makedumpfile"
+      }
+    },
     "mdadm": {
       "evra": "4.2-8.fc40.x86_64",
       "metadata": {

manifests/fedora-coreos-base.yaml

@@ -159,6 +159,12 @@ packages:
   - amd-gpu-firmware intel-gpu-firmware nvidia-gpu-firmware
   # NIC firmware we've traditionally shipped but then were split out of linux-firmware in Fedora
   - qed-firmware # https://github.com/coreos/fedora-coreos-tracker/issues/1746
+  # makedumpfile and kexec were split into subpackages in kexec-tools 0.2.28-7
+  # which is not in RHCOS yet
+  # These should be with kexec-tools in the user-experience manifest, move them
+  # once the split lands in RHCOS.
+  - makedumpfile
+  - kdump-utils
 
 
 # - irqbalance

manifests/fedora-coreos.yaml

@@ -33,9 +33,6 @@ conditional-include:
   - if: releasever == 39
     # Checks for breaking changes that came with Podman v5.
     include: podman-v5.yaml
-  - if: releasever >= 41
-    # Include makedumpfile and kdump-utils subpackages from kexec-tools (new in F41+)
-    include: kdump.yaml
   # On <41, we want to keep making sure dnf doesn't slip in somehow
   # On 41+, we do want it
   # https://github.com/coreos/fedora-coreos-tracker/issues/1687