Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifests: Prepare for CentOS Stream 9 -> 10 transition #3015

Merged
merged 3 commits into from
Sep 19, 2024
Merged

manifests: Prepare for CentOS Stream 9 -> 10 transition #3015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52f8bc3
manifests: Move NetworkManager-team/teamd to EL9 shared manifest
travier May 13, 2024
79418f8
manifests: Move runc to EL9 shared manifest
travier Jun 5, 2024
2c658ba
manifests: Move GPU firmwares & kdump tools to EL10 shared manifest
travier May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions manifests/fedora-coreos-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ include:
- shared-workarounds.yaml
# See https://github.com/coreos/bootupd
- bootupd.yaml
- shared-el9.yaml
- shared-el10.yaml
ostree-layers:
- overlay/05core
- overlay/08nouveau
Expand Down Expand Up @@ -155,16 +157,8 @@ packages:
# In F35+ need `iptables-legacy` package
# See https://github.com/coreos/fedora-coreos-tracker/issues/676#issuecomment-928028451
- iptables-legacy
# GPU Firmware files (not broken out into subpackage of linux-firmware in RHEL yet)
- 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
Expand Down
3 changes: 0 additions & 3 deletions manifests/networking-tools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ packages:
- NetworkManager hostname
# Interactive Networking configuration during coreos-install
- NetworkManager-tui
# Teaming https://github.com/coreos/fedora-coreos-config/pull/289
# and http://bugzilla.redhat.com/1758162
- NetworkManager-team teamd
# Support for cloud quirks and dynamic config in real rootfs:
# https://github.com/coreos/fedora-coreos-tracker/issues/320
- NetworkManager-cloud-setup
Expand Down
8 changes: 8 additions & 0 deletions manifests/shared-el10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Shared with EL 10 (CentOS Stream 10 and RHCOS 10) only
packages:
# GPU Firmware files (not broken out into subpackage of linux-firmware in RHEL yet)
- amd-gpu-firmware intel-gpu-firmware nvidia-gpu-firmware
# makedumpfile and kexec were split into subpackages in kexec-tools 0.2.28-7
# These should be with kexec-tools in the user-experience manifest
- makedumpfile
- kdump-utils
7 changes: 7 additions & 0 deletions manifests/shared-el9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Shared with EL 9 (CentOS Stream 9 and RHCOS 9) only
packages:
# Teaming https://github.com/coreos/fedora-coreos-config/pull/289
# and http://bugzilla.redhat.com/1758162
- NetworkManager-team teamd
# runc is not in C10S
- runc
1 change: 0 additions & 1 deletion manifests/user-experience.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ packages:
## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
- crun criu criu-libs
- podman
- runc
- skopeo
- toolbox
# passt provides user-mode networking daemons for namespaces
Expand Down
Loading