Skip to content

Commit

Permalink
Revert "manifests: enable cliwrap on Fedora 40+"
Browse files Browse the repository at this point in the history
This reverts commit 1cfbd77.

This seems to be breaking `ext.config.rpm-ostree.kernel-replace` at
least:

coreos/fedora-coreos-tracker#1679
  • Loading branch information
jlebon authored and dustymabe committed Feb 27, 2024
1 parent a2bc379 commit 3789b06
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions manifests/cliwrap.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ conditional-include:
- if: releasever == 39
# Checks for breaking changes that came with Podman v5.
include: podman-v5.yaml
- if: releasever >= 40
include: cliwrap.yaml

ostree-layers:
- overlay/15fcos
Expand Down
6 changes: 0 additions & 6 deletions tests/kola/extensions/package
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,3 @@ if [[ -n "${failed}" ]]; then
fatal "could not install: ${failed}"
fi
ok "successfully installed os rpm package extensions"

# also try the wrapped dnf
if jq -e .cliwrap /usr/share/rpm-ostree/treefile.json; then
dnf install -y 'ltrace'
ok "dnf cliwrap"
fi

0 comments on commit 3789b06

Please sign in to comment.