From 2c658bace25940f4771cc79ca8e72ebbc1e11261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 14 May 2024 15:03:12 +0200 Subject: [PATCH] manifests: Move GPU firmwares & kdump tools to EL10 shared manifest Move packages to an Enterprise Linux 10 only manifest to prepare for the package split changes: - GPU firmwares are split into their own package in CentOS Stream 10 - kdump tools are split between kexec-utils, makedumpfile and kdump-utils --- manifests/fedora-coreos-base.yaml | 9 +-------- manifests/shared-el10.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 manifests/shared-el10.yaml diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index 67814ca9e7..98de277d27 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -13,6 +13,7 @@ include: # See https://github.com/coreos/bootupd - bootupd.yaml - shared-el9.yaml + - shared-el10.yaml ostree-layers: - overlay/05core - overlay/08nouveau @@ -156,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 diff --git a/manifests/shared-el10.yaml b/manifests/shared-el10.yaml new file mode 100644 index 0000000000..c6fae202b8 --- /dev/null +++ b/manifests/shared-el10.yaml @@ -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