From 68afb072a5a1396c7424ed536a896293fff8287d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 4 Mar 2023 09:33:35 -0500
Subject: [PATCH] Add new `c9s-rt` variant

I think having an image with RT enabled out of the box just makes
sense.
---
 .github/workflows/build.yaml |  2 +-
 c9s-base.yaml                | 20 ++++++++++++++++++++
 c9s-rt.yaml                  |  3 +++
 c9s.yaml                     | 21 +++------------------
 fedora.yaml                  |  1 +
 oscore/bootc.yaml            |  2 +-
 oscore/kernel-rt.yaml        | 10 ++++++++++
 oscore/kernel.yaml           |  6 ++++++
 8 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 c9s-base.yaml
 create mode 100644 c9s-rt.yaml
 create mode 100644 oscore/kernel-rt.yaml
 create mode 100644 oscore/kernel.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9917b62..2cf2509 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["fedora", "c9s"]
+        os: ["fedora", "c9s", "c9s-rt"]
     container:
       # Yes, we're using this as a *builder* image.
       image: quay.io/fedora/fedora-coreos:stable
diff --git a/c9s-base.yaml b/c9s-base.yaml
new file mode 100644
index 0000000..ac6d049
--- /dev/null
+++ b/c9s-base.yaml
@@ -0,0 +1,20 @@
+releasever: stream9
+
+repos:
+  - baseos
+  - appstream
+  - coreos-continuous-c9s
+  - bootc-c9s
+
+metadata:
+  name: c9s-oscore
+  summary: CentOS 9 OSCore
+
+repo-packages:
+  - repo: bootc-c9s
+    packages:
+      - bootc
+
+include:
+  - oscore/manifest.yaml
+
diff --git a/c9s-rt.yaml b/c9s-rt.yaml
new file mode 100644
index 0000000..680e09b
--- /dev/null
+++ b/c9s-rt.yaml
@@ -0,0 +1,3 @@
+include:
+  - c9s-base.yaml
+  - oscore/kernel-rt.yaml
diff --git a/c9s.yaml b/c9s.yaml
index 184d701..d516e04 100644
--- a/c9s.yaml
+++ b/c9s.yaml
@@ -1,19 +1,4 @@
-releasever: stream9
-
-repos:
-  - baseos
-  - appstream
-  - coreos-continuous-c9s
-  - bootc-c9s
-
-metadata:
-  name: c9s-oscore
-  summary: CentOS 9 OSCore
-
-repo-packages:
-  - repo: bootc-c9s
-    packages:
-      - bootc
-
 include:
-  - oscore/manifest.yaml
+  - c9s-base.yaml
+  - oscore/kernel.yaml
+
diff --git a/fedora.yaml b/fedora.yaml
index a3e4d57..9ab0de1 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -12,6 +12,7 @@ metadata:
 
 include:
   - oscore/manifest.yaml
+  - oscore/kernel.yaml
 
 repo-packages:
   - repo: bootc-fedora
diff --git a/oscore/bootc.yaml b/oscore/bootc.yaml
index 3030aaf..00bc28d 100644
--- a/oscore/bootc.yaml
+++ b/oscore/bootc.yaml
@@ -1,7 +1,7 @@
 # A relatively minimal base, but we also do include linux-firmware so
 # we can be directly booted on metal.
 packages:
- - 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/oscore/kernel-rt.yaml b/oscore/kernel-rt.yaml
new file mode 100644
index 0000000..cdcff10
--- /dev/null
+++ b/oscore/kernel-rt.yaml
@@ -0,0 +1,10 @@
+repos:
+  - rt
+  - nfv
+
+# Enable the "realtime" AKA soft-realtime AKA latency-optimized kernel.
+packages:
+ - kernel-rt-core kernel-rt-modules kernel-rt-modules-extra kernel-rt-kvm
+
+exclude-packages:
+  - kernel-rt-debug-core
diff --git a/oscore/kernel.yaml b/oscore/kernel.yaml
new file mode 100644
index 0000000..0dd777d
--- /dev/null
+++ b/oscore/kernel.yaml
@@ -0,0 +1,6 @@
+# Enable the Linux kernel; see also kernel-rt.
+packages:
+ - kernel
+
+exclude-packages:
+  - kernel-debug