Skip to content

Commit

Permalink
tree: promote changes from next-devel at 5f6d5c4
Browse files Browse the repository at this point in the history
  • Loading branch information
coreosbot committed Apr 19, 2024
1 parent 70fb3e0 commit 9989a8f
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 12 deletions.
32 changes: 28 additions & 4 deletions manifest-lock.overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,30 @@ packages:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-a960990153
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1674#issuecomment-2010200582
type: fast-track
glibc:
evr: 2.39-8.fc40
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-eafbf519ec
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1711
type: fast-track
glibc-common:
evr: 2.39-8.fc40
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-eafbf519ec
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1711
type: fast-track
glibc-gconv-extra:
evr: 2.39-8.fc40
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-eafbf519ec
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1711
type: fast-track
glibc-minimal-langpack:
evr: 2.39-8.fc40
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-eafbf519ec
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1711
type: fast-track
gnutls:
evr: 3.8.4-1.fc40
metadata:
Expand Down Expand Up @@ -136,15 +160,15 @@ packages:
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1674#issuecomment-2010200582
type: fast-track
rpm-ostree:
evr: 2024.4-5.fc40
evr: 2024.5-2.fc40
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-589189d414
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-b59ee8264e
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1674#issuecomment-2010200582
type: fast-track
rpm-ostree-libs:
evr: 2024.4-5.fc40
evr: 2024.5-2.fc40
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-589189d414
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-b59ee8264e
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1674#issuecomment-2010200582
type: fast-track
socat:
Expand Down
4 changes: 2 additions & 2 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ conditional-include:
# Checks for breaking changes that came with Podman v5.
include: podman-v5.yaml
- if: releasever >= 41
# Include makedumpfile subpackage from kexec-tools (new in F41+)
include: makedumpfile.yaml
# 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
Expand Down
8 changes: 8 additions & 0 deletions manifests/kdump.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
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 <F41.
- makedumpfile
# systemd service files and other tools were moved into a subpackage
# in F41+. Move this to a main manifest file when we no longer support <F41.
# https://src.fedoraproject.org/rpms/kexec-tools/c/372b4c6c1597c3d9aaddda2d691260474973989e?branch=rawhide
- kdump-utils
4 changes: 0 additions & 4 deletions manifests/makedumpfile.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ EARLY_DIR="${2:-/tmp}"

IFS=" " read -r -a cmdline <<< "$(</proc/cmdline)"
cmdline_arg() {
local name value
name="$1"
local name="$1" value=""
for arg in "${cmdline[@]}"; do
if [[ "${arg%%=*}" == "${name}" ]]; then
value="${arg#*=}"
Expand Down

0 comments on commit 9989a8f

Please sign in to comment.