From ef5551d21a05ab5bb29bbf160642cc95c7c26b88 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 15 Sep 2023 17:05:55 -0400 Subject: [PATCH] manifests: Move kernel into fedora-coreos-base This is prep for rebasing on [sagano](https://gitlab.com/cgwalters-playground/sagano) where I hit on the issue that to build images with `kernel-rt`, we need to clearly separate the `kernel` package from userspace stuff (`systemd`, `rpm-ostree`) etc. Note that we'll need to make the same change in RHCOS - until we rebase both on sagano. --- manifests/bootable-rpm-ostree.yaml | 5 ++--- manifests/fedora-coreos-base.yaml | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/bootable-rpm-ostree.yaml b/manifests/bootable-rpm-ostree.yaml index fdb9c8b078..9d5faddbec 100644 --- a/manifests/bootable-rpm-ostree.yaml +++ b/manifests/bootable-rpm-ostree.yaml @@ -1,12 +1,11 @@ -# This minimal base starts just from: kernel + systemd + rpm-ostree + bootloader. +# This minimal base is the userspace: systemd + rpm-ostree + bootloader. # The intent of this is to inherit from this if you are doing something highly # custom that e.g. might not involve Ignition or podman, but you do want # rpm-ostree. # We expect most people though using coreos-assembler to inherit from # fedora-coreos-base.yaml. packages: - # Kernel + systemd. - - kernel systemd + - systemd # linux-firmware now a recommends so let's explicitly include it # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b # https://src.fedoraproject.org/rpms/kernel/c/f55c3e9ed8605ff28cb9a922efbab1055947e213?branch=rawhide diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index eec7561aef..bdc901a932 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -96,6 +96,8 @@ postprocess: # available in RHCOS or not desired in RHCOS). All other packages should go # into one of the sub-manifests listed at the top. packages: + # We use the default kernel package, but note c9s may differ + - kernel # Security - polkit # Containers