From 380886b80aa64eecbf254ab7ea6cd8ea521070b8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 13 Sep 2023 17:45:16 -0400 Subject: [PATCH] A few renames; oscore -> tier-1 Prep for multiple tiers. --- README.md | 2 +- c9s-base.yaml | 6 +++--- c9s-rt.yaml | 2 +- c9s.yaml | 2 +- fedora.yaml | 8 ++++---- {oscore => tier-1}/bootable-rpm-ostree.yaml | 0 {oscore => tier-1}/bootc.yaml | 0 {oscore => tier-1}/bootupd.yaml | 0 {oscore => tier-1}/fwupd.yaml | 0 {oscore => tier-1}/group | 0 {oscore => tier-1}/grub2-removals.yaml | 0 {oscore => tier-1}/initramfs.yaml | 0 {oscore => tier-1}/kdump-aarch64-aws-workaround.yaml | 0 {oscore => tier-1}/kernel-rt.yaml | 0 {oscore => tier-1}/kernel.yaml | 0 {oscore => tier-1}/manifest.yaml | 0 {oscore => tier-1}/networking-tools.yaml | 0 {oscore => tier-1}/passwd | 0 {oscore => tier-1}/system-configuration.yaml | 0 {oscore => tier-1}/user-experience.yaml | 0 20 files changed, 10 insertions(+), 10 deletions(-) rename {oscore => tier-1}/bootable-rpm-ostree.yaml (100%) rename {oscore => tier-1}/bootc.yaml (100%) rename {oscore => tier-1}/bootupd.yaml (100%) rename {oscore => tier-1}/fwupd.yaml (100%) rename {oscore => tier-1}/group (100%) rename {oscore => tier-1}/grub2-removals.yaml (100%) rename {oscore => tier-1}/initramfs.yaml (100%) rename {oscore => tier-1}/kdump-aarch64-aws-workaround.yaml (100%) rename {oscore => tier-1}/kernel-rt.yaml (100%) rename {oscore => tier-1}/kernel.yaml (100%) rename {oscore => tier-1}/manifest.yaml (100%) rename {oscore => tier-1}/networking-tools.yaml (100%) rename {oscore => tier-1}/passwd (100%) rename {oscore => tier-1}/system-configuration.yaml (100%) rename {oscore => tier-1}/user-experience.yaml (100%) diff --git a/README.md b/README.md index eec7425..49caa41 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ via `rpm-ostree compose image`. ## What's in them? -The [current manifest definitions](oscore/) were forked from Fedora CoreOS, but significantly +The [current manifest definitions](tier-1/) were forked from Fedora CoreOS, but significantly cut down. The existing content set is obviously subject to change and debate. diff --git a/c9s-base.yaml b/c9s-base.yaml index 505cd6a..ce43b67 100644 --- a/c9s-base.yaml +++ b/c9s-base.yaml @@ -5,9 +5,9 @@ repos: - appstream metadata: - name: c9s-oscore - summary: CentOS 9 OSCore + name: c9s-boot-tier1 + summary: CentOS 9 Bootable Tier 1 include: - - oscore/manifest.yaml + - tier-1/manifest.yaml diff --git a/c9s-rt.yaml b/c9s-rt.yaml index 680e09b..b0137e3 100644 --- a/c9s-rt.yaml +++ b/c9s-rt.yaml @@ -1,3 +1,3 @@ include: - c9s-base.yaml - - oscore/kernel-rt.yaml + - tier-1/kernel-rt.yaml diff --git a/c9s.yaml b/c9s.yaml index d516e04..8a639cf 100644 --- a/c9s.yaml +++ b/c9s.yaml @@ -1,4 +1,4 @@ include: - c9s-base.yaml - - oscore/kernel.yaml + - tier-1/kernel.yaml diff --git a/fedora.yaml b/fedora.yaml index 8866cef..4529f50 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -5,12 +5,12 @@ repos: - fedora-updates metadata: - name: fedora-oscore - summary: Fedora OSCore + name: fedora-boot-tier1 + summary: Fedora Bootable Tier 1 include: - - oscore/manifest.yaml - - oscore/kernel.yaml + - tier-1/manifest.yaml + - tier-1/kernel.yaml packages: # Storage; it's used in Fedora workstation for example, so we will enable it here. diff --git a/oscore/bootable-rpm-ostree.yaml b/tier-1/bootable-rpm-ostree.yaml similarity index 100% rename from oscore/bootable-rpm-ostree.yaml rename to tier-1/bootable-rpm-ostree.yaml diff --git a/oscore/bootc.yaml b/tier-1/bootc.yaml similarity index 100% rename from oscore/bootc.yaml rename to tier-1/bootc.yaml diff --git a/oscore/bootupd.yaml b/tier-1/bootupd.yaml similarity index 100% rename from oscore/bootupd.yaml rename to tier-1/bootupd.yaml diff --git a/oscore/fwupd.yaml b/tier-1/fwupd.yaml similarity index 100% rename from oscore/fwupd.yaml rename to tier-1/fwupd.yaml diff --git a/oscore/group b/tier-1/group similarity index 100% rename from oscore/group rename to tier-1/group diff --git a/oscore/grub2-removals.yaml b/tier-1/grub2-removals.yaml similarity index 100% rename from oscore/grub2-removals.yaml rename to tier-1/grub2-removals.yaml diff --git a/oscore/initramfs.yaml b/tier-1/initramfs.yaml similarity index 100% rename from oscore/initramfs.yaml rename to tier-1/initramfs.yaml diff --git a/oscore/kdump-aarch64-aws-workaround.yaml b/tier-1/kdump-aarch64-aws-workaround.yaml similarity index 100% rename from oscore/kdump-aarch64-aws-workaround.yaml rename to tier-1/kdump-aarch64-aws-workaround.yaml diff --git a/oscore/kernel-rt.yaml b/tier-1/kernel-rt.yaml similarity index 100% rename from oscore/kernel-rt.yaml rename to tier-1/kernel-rt.yaml diff --git a/oscore/kernel.yaml b/tier-1/kernel.yaml similarity index 100% rename from oscore/kernel.yaml rename to tier-1/kernel.yaml diff --git a/oscore/manifest.yaml b/tier-1/manifest.yaml similarity index 100% rename from oscore/manifest.yaml rename to tier-1/manifest.yaml diff --git a/oscore/networking-tools.yaml b/tier-1/networking-tools.yaml similarity index 100% rename from oscore/networking-tools.yaml rename to tier-1/networking-tools.yaml diff --git a/oscore/passwd b/tier-1/passwd similarity index 100% rename from oscore/passwd rename to tier-1/passwd diff --git a/oscore/system-configuration.yaml b/tier-1/system-configuration.yaml similarity index 100% rename from oscore/system-configuration.yaml rename to tier-1/system-configuration.yaml diff --git a/oscore/user-experience.yaml b/tier-1/user-experience.yaml similarity index 100% rename from oscore/user-experience.yaml rename to tier-1/user-experience.yaml