Merge branch 'pr/tier-1-inherit' into 'main'

tier-1: inherit from tier-x

See merge request fedora/bootc/base-images!53

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.

tier-1/bootable-rpm-ostree.yaml

@@ -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

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
+  # Additional file compression/decompression
-  ## jq - parsing/interacting with JSON data
+  - bzip2 zstd
-  - 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
   # 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

tier-1/firmware.yaml

@@ -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

tier-1/fwupd.yaml

@@ -1,5 +0,0 @@
-# Firmware updates
-packages-aarch64:
-  - fwupd
-packages-x86_64:
-  - fwupd

tier-1/manifest.yaml

@@ -2,15 +2,11 @@
 recommends: true
 
 include:
-  - ../tier-0/manifest.yaml
+  - ../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
 

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:

tier-1/podman.yaml

@@ -1,7 +0,0 @@
-# Core podman bits
-
-packages:
-  - crun
-  - podman
-  - container-selinux
-  - skopeo

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

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
@@ -43,4 +38,5 @@ packages:
   # rpm-ostree
   - rpm-ostree nss-altfiles
   # firmware updates
+  # If you're using linux-firmware, you probably also want fwupd
   - fwupd