From 1c6bb7f917475d2e7e4aaeccfe60b724ee41a51c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 21 Feb 2025 13:16:43 -0500 Subject: [PATCH] minimal: Require kernel.yaml We have a legacy of trying to support using e.g. kernel-rt. But it adds complexity in the inheritance because minimal/manifest.yaml isn't standalone, it also needs a kernel. As part of custom base images I want to simplify this. In order to use kernel-rt, we'll just say that you build a minimal base, and then swap to kernel-rt as a secondary step for now. Signed-off-by: Colin Walters --- fedora-bootc.yaml | 1 - fedora-minimal.yaml | 1 - fedora-tier-x.yaml | 1 - minimal/manifest.yaml | 1 + tier-1/kernel.yaml | 1 - tier-x/kernel.yaml | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) delete mode 120000 tier-1/kernel.yaml delete mode 120000 tier-x/kernel.yaml diff --git a/fedora-bootc.yaml b/fedora-bootc.yaml index 68dc692..11763a0 100644 --- a/fedora-bootc.yaml +++ b/fedora-bootc.yaml @@ -5,4 +5,3 @@ metadata: include: - fedora-generic.yaml - tier-1/manifest.yaml - - tier-1/kernel.yaml diff --git a/fedora-minimal.yaml b/fedora-minimal.yaml index 77cd0e2..76762f6 100644 --- a/fedora-minimal.yaml +++ b/fedora-minimal.yaml @@ -5,4 +5,3 @@ metadata: include: - fedora-generic.yaml - minimal/manifest.yaml - - minimal/kernel.yaml diff --git a/fedora-tier-x.yaml b/fedora-tier-x.yaml index 90a96fd..f80d107 100644 --- a/fedora-tier-x.yaml +++ b/fedora-tier-x.yaml @@ -5,4 +5,3 @@ metadata: include: - fedora-generic.yaml - tier-x/manifest.yaml - - tier-x/kernel.yaml diff --git a/minimal/manifest.yaml b/minimal/manifest.yaml index 13f6f71..eff48af 100644 --- a/minimal/manifest.yaml +++ b/minimal/manifest.yaml @@ -15,6 +15,7 @@ remove-from-packages: - [systemd-udev, /usr/lib/systemd/system-generators/systemd-gpt-auto-generator] include: + - kernel.yaml - postprocess-conf.yaml - bootc.yaml - bootupd.yaml diff --git a/tier-1/kernel.yaml b/tier-1/kernel.yaml deleted file mode 120000 index d6f64cc..0000000 --- a/tier-1/kernel.yaml +++ /dev/null @@ -1 +0,0 @@ -../tier-0/kernel.yaml \ No newline at end of file diff --git a/tier-x/kernel.yaml b/tier-x/kernel.yaml deleted file mode 120000 index d6f64cc..0000000 --- a/tier-x/kernel.yaml +++ /dev/null @@ -1 +0,0 @@ -../tier-0/kernel.yaml \ No newline at end of file