Skip to content

Commit

Permalink
manifests: Move kernel into fedora-coreos-base
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cgwalters committed Oct 27, 2023
1 parent 6b1b56b commit 5892c56
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 2 additions & 3 deletions manifests/bootable-rpm-ostree.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5892c56

Please sign in to comment.