From d65c8fa91e8b9952d24b9914b359a5027b04bf20 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 18 Sep 2024 14:46:27 -0400 Subject: [PATCH 1/3] tier-x: drop dnsmasq and slirp4netns These packages are in all the variants, but not tier-1. We want tier-1 to inherit from tier-x, so remove them. --- tier-x/manifest.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tier-x/manifest.yaml b/tier-x/manifest.yaml index 384110b..c6bbf35 100644 --- a/tier-x/manifest.yaml +++ b/tier-x/manifest.yaml @@ -20,16 +20,11 @@ packages: # zram-generator (but not zram-generator-defaults) for F33 change # https://github.com/coreos/fedora-coreos-tracker/issues/509 - zram-generator - # Some host applications(i.e. NetworkManager) use dnsmasq - # as the binary for some various utility operations. - # https://github.com/coreos/fedora-coreos-tracker/issues/519 - - dnsmasq # networking - iptables-nft - NetworkManager - openssh-clients - openssh-server - - slirp4netns # rootless podman networking - systemd-resolved # linux-firmware now a recommends so let's explicitly include it # https://gitlab.com/cki-project/kernel-ark/-/commit/32271d0cd9bd52d386eb35497c4876a8f041f70b From 034cf4bf28a92bf217604875ab2d6a58ba819dcf Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 18 Sep 2024 15:16:46 -0400 Subject: [PATCH 2/3] tier-1: inherit from tier-x We want tier-1 to be another consumer of tier-x, kind of like its own top-level Fedora variant. That way, tier-1 is now a strict superset of tier-x, just like the other variants. --- README.md | 2 +- tier-1/manifest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0d89821..d5a77ed 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ There are currently 3 tiers: used by all image-based Fedora variants (IoT, Atomic Desktops, and CoreOS). Changes to this tier may be done without accounting for external users. -Both **tier-1** and **tier-x** inherit from **tier-0**. +**tier-1** inherits from **tier-x** and **tier-x** in turn inherit from **tier-0**. All non-trivial changes to **tier-0** and **tier-x** should be ACKed by at least one stakeholder of each Fedora variant WGs. diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml index 646374d..1e03c7d 100644 --- a/tier-1/manifest.yaml +++ b/tier-1/manifest.yaml @@ -2,7 +2,7 @@ recommends: true include: - - ../tier-0/manifest.yaml + - ../tier-x/manifest.yaml - autoupdates.yaml - bootable-rpm-ostree.yaml - podman.yaml From 83542ad32e8b127348be5224a6dc4b9a0195452a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 18 Sep 2024 15:18:57 -0400 Subject: [PATCH 3/3] tier-1: drop a bunch of redundant packages These are all included in tier-x or tier-0 already. Though it does drop bsdtar. This isn't really well-known enough to belong here. It's included in FCOS because we use it in our scripts, but it's not a requirement for any tier-1 logic AFAIK and I would be surprised if users expected it there. --- tier-1/bootable-rpm-ostree.yaml | 8 -------- tier-1/coreos-user-experience.yaml | 28 ++-------------------------- tier-1/firmware.yaml | 7 ------- tier-1/fwupd.yaml | 5 ----- tier-1/manifest.yaml | 12 +----------- tier-1/networking-tools.yaml | 2 -- tier-1/podman.yaml | 7 ------- tier-1/system-configuration.yaml | 4 ---- tier-x/manifest.yaml | 1 + 9 files changed, 4 insertions(+), 70 deletions(-) delete mode 100644 tier-1/bootable-rpm-ostree.yaml delete mode 100644 tier-1/firmware.yaml delete mode 100644 tier-1/fwupd.yaml delete mode 100644 tier-1/podman.yaml diff --git a/tier-1/bootable-rpm-ostree.yaml b/tier-1/bootable-rpm-ostree.yaml deleted file mode 100644 index 4a1f243..0000000 --- a/tier-1/bootable-rpm-ostree.yaml +++ /dev/null @@ -1,8 +0,0 @@ -packages: - - rpm-ostree nss-altfiles - -exclude-packages: - # Exclude kernel-debug-core to make sure that it doesn't somehow get - # chosen as the package to satisfy the `kernel-core` dependency from - # the kernel package. - - kernel-debug-core diff --git a/tier-1/coreos-user-experience.yaml b/tier-1/coreos-user-experience.yaml index 5fc58be..1098094 100644 --- a/tier-1/coreos-user-experience.yaml +++ b/tier-1/coreos-user-experience.yaml @@ -1,40 +1,16 @@ # This file was forked/copied from Fedora CoreOS. TODO: resync # once we have a good generic mechanism for sharing. packages: - # Basic user tools - ## jq - parsing/interacting with JSON data - - bash-completion - - coreutils - - file - - jq - - less - - sudo - - vim-minimal - # File compression/decompression - ## bsdtar - dependency of 35coreos-live dracut module - - bsdtar - - bzip2 - - gzip - - tar - - xz - - zstd + # Additional file compression/decompression + - bzip2 zstd # Improved MOTD experience - console-login-helper-messages-issuegen - console-login-helper-messages-profile # kdump support # https://github.com/coreos/fedora-coreos-tracker/issues/622 - kexec-tools - # Remote Access - - openssh-clients openssh-server # Container tooling - ## crun recommends but doesn't require criu and criu-libs. We want them for - ## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370 - - crun criu criu-libs - - podman - - skopeo - toolbox - # passt provides user-mode networking daemons for namespaces - - passt # nvme-cli for managing nvme disks - nvme-cli # Used by admins interactively diff --git a/tier-1/firmware.yaml b/tier-1/firmware.yaml deleted file mode 100644 index 1c778cf..0000000 --- a/tier-1/firmware.yaml +++ /dev/null @@ -1,7 +0,0 @@ - packages: - # 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 - - linux-firmware - # If you're using linux-firmware, you probably also want fwupd - - fwupd diff --git a/tier-1/fwupd.yaml b/tier-1/fwupd.yaml deleted file mode 100644 index 0045a30..0000000 --- a/tier-1/fwupd.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Firmware updates -packages-aarch64: - - fwupd -packages-x86_64: - - fwupd diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml index 1e03c7d..c84117b 100644 --- a/tier-1/manifest.yaml +++ b/tier-1/manifest.yaml @@ -4,13 +4,9 @@ recommends: true include: - ../tier-x/manifest.yaml - autoupdates.yaml - - bootable-rpm-ostree.yaml - - podman.yaml - - firmware.yaml - networking-tools.yaml - system-configuration.yaml - coreos-user-experience.yaml - - fwupd.yaml - persistent-journal.yaml - initramfs-full.yaml - generic-growfs.yaml @@ -18,12 +14,10 @@ include: packages: # Include and set the default editor - nano - # And we expect this in general - - vim-minimal - nfs-utils # Additional firewall support; we aren't including these in RHCOS or they # don't exist in RHEL - - iptables-nft iptables-services + - iptables-services - WALinuxAgent-udev # Allow communication between sudo and SSSD # for caching sudo rules by SSSD. @@ -32,9 +26,7 @@ packages: # SSSD; we only ship a subset of the backends - sssd-client sssd-ad sssd-ipa sssd-krb5 sssd-ldap # Used by admins interactively - - attr - openssl - - lsof # Provides terminal tools like clear, reset, tput, and tset - ncurses # i18n @@ -42,8 +34,6 @@ packages: # zram-generator (but not zram-generator-defaults) for F33 change # https://github.com/coreos/fedora-coreos-tracker/issues/509 - zram-generator - # resolved was broken out to its own package in rawhide/f35 - - systemd-resolved # This one is in Python so isn't in FCOS, but we can safely add it here. - sos diff --git a/tier-1/networking-tools.yaml b/tier-1/networking-tools.yaml index 7ff54e5..7d6e7d1 100644 --- a/tier-1/networking-tools.yaml +++ b/tier-1/networking-tools.yaml @@ -3,8 +3,6 @@ # generic enough to be shared downstream with RHCOS. packages: - # Standard tools for configuring network/hostname - - NetworkManager hostname # Interactive Networking configuration during coreos-install - NetworkManager-tui # Support for cloud quirks and dynamic config in real rootfs: diff --git a/tier-1/podman.yaml b/tier-1/podman.yaml deleted file mode 100644 index 6c40c5d..0000000 --- a/tier-1/podman.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Core podman bits - -packages: - - crun - - podman - - container-selinux - - skopeo diff --git a/tier-1/system-configuration.yaml b/tier-1/system-configuration.yaml index 28d8df3..561da50 100644 --- a/tier-1/system-configuration.yaml +++ b/tier-1/system-configuration.yaml @@ -9,11 +9,7 @@ packages: # NTP support - chrony # Storage configuration/management - - lvm2 - - cryptsetup - - e2fsprogs - sg3_utils - - xfsprogs ## This is generally useful... https://github.com/CentOS/centos-bootc/issues/394 - cloud-utils-growpart # User configuration diff --git a/tier-x/manifest.yaml b/tier-x/manifest.yaml index c6bbf35..dc8ee4d 100644 --- a/tier-x/manifest.yaml +++ b/tier-x/manifest.yaml @@ -38,4 +38,5 @@ packages: # rpm-ostree - rpm-ostree nss-altfiles # firmware updates + # If you're using linux-firmware, you probably also want fwupd - fwupd