From 53fc5feabb269140c370faae666e6a27e2ce43e5 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Wed, 3 Jul 2024 17:24:45 +0200 Subject: [PATCH] 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] https://github.com/coreos/fedora-coreos-config/commit/437dc2a3f9a8207eb639e487500466a762d8888a [2] https://bodhi.fedoraproject.org/updates/FEDORA-2024-d70dfd026e --- manifest-lock.ppc64le.json | 14 ++++++++++++- manifest-lock.s390x.json | 14 ++++++++++++- manifest-lock.x86_64.json | 36 ++++++++++++++++++++++------------ manifests/fedora-coreos.yaml | 3 --- manifests/kdump.yaml | 8 -------- manifests/user-experience.yaml | 2 ++ 6 files changed, 52 insertions(+), 25 deletions(-) delete mode 100644 manifests/kdump.yaml diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json index 6542923193..f6380fa51c 100644 --- a/manifest-lock.ppc64le.json +++ b/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": { diff --git a/manifest-lock.s390x.json b/manifest-lock.s390x.json index 265b10e8ec..4ff84d0034 100644 --- a/manifest-lock.s390x.json +++ b/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": { diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json index f59f516ef5..0c375acee9 100644 --- a/manifest-lock.x86_64.json +++ b/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" } @@ -1489,7 +1495,7 @@ } }, "libpkgconf": { - "evra": "2.1.0-1.fc40.x86_64", + "evra": "2.1.1-1.fc40.x86_64", "metadata": { "sourcerpm": "pkgconf" } @@ -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": { @@ -1963,19 +1975,19 @@ } }, "openssh": { - "evra": "9.6p1-1.fc40.2.x86_64", + "evra": "9.6p1-1.fc40.4.x86_64", "metadata": { "sourcerpm": "openssh" } }, "openssh-clients": { - "evra": "9.6p1-1.fc40.2.x86_64", + "evra": "9.6p1-1.fc40.4.x86_64", "metadata": { "sourcerpm": "openssh" } }, "openssh-server": { - "evra": "9.6p1-1.fc40.2.x86_64", + "evra": "9.6p1-1.fc40.4.x86_64", "metadata": { "sourcerpm": "openssh" } @@ -2071,19 +2083,19 @@ } }, "pkgconf": { - "evra": "2.1.0-1.fc40.x86_64", + "evra": "2.1.1-1.fc40.x86_64", "metadata": { "sourcerpm": "pkgconf" } }, "pkgconf-m4": { - "evra": "2.1.0-1.fc40.noarch", + "evra": "2.1.1-1.fc40.noarch", "metadata": { "sourcerpm": "pkgconf" } }, "pkgconf-pkg-config": { - "evra": "2.1.0-1.fc40.x86_64", + "evra": "2.1.1-1.fc40.x86_64", "metadata": { "sourcerpm": "pkgconf" } @@ -2593,7 +2605,7 @@ } }, "zlib-ng-compat": { - "evra": "2.1.6-5.fc40.x86_64", + "evra": "2.1.7-1.fc40.x86_64", "metadata": { "sourcerpm": "zlib-ng" } @@ -2612,16 +2624,16 @@ } }, "metadata": { - "generated": "2024-07-01T00:00:00Z", + "generated": "2024-07-03T00:00:00Z", "rpmmd_repos": { "fedora": { "generated": "2024-04-14T18:51:11Z" }, "fedora-coreos-pool": { - "generated": "2024-06-30T23:46:32Z" + "generated": "2024-07-02T16:47:33Z" }, "fedora-updates": { - "generated": "2024-07-01T04:46:07Z" + "generated": "2024-07-03T02:30:56Z" } } } diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index 0be3297d23..a79fdc5598 100644 --- a/manifests/fedora-coreos.yaml +++ b/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 diff --git a/manifests/kdump.yaml b/manifests/kdump.yaml deleted file mode 100644 index cee3521c68..0000000000 --- a/manifests/kdump.yaml +++ /dev/null @@ -1,8 +0,0 @@ -packages: -# makedumpfile is needed for kdump and was broken out to a subpackage -# in F41+. Move this to a main manifest file when we no longer support