mirror of
https://github.com/coreos/fedora-coreos-config.git
synced 2026-02-05 09:45:30 +01:00
tree: import changes from testing-devel at 31598a1705
This commit is contained in:
CoreOS Bot
@@ -1,37 +0,0 @@
|
||||
# This minimal base is the userspace: systemd + rpm-ostree + bootloader.
|
||||
# The intent of this is to inherit from this if you are doing something highly
|
||||
# custom that e.g. might not involve Ignition or podman, but you do want
|
||||
# rpm-ostree.
|
||||
# We expect most people though using coreos-assembler to inherit from
|
||||
# fedora-coreos-base.yaml.
|
||||
packages:
|
||||
- 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
|
||||
- linux-firmware
|
||||
# rpm-ostree
|
||||
- rpm-ostree nss-altfiles
|
||||
# firmware updates
|
||||
- fwupd
|
||||
# https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora
|
||||
- bootc
|
||||
|
||||
# bootloader
|
||||
packages-aarch64:
|
||||
- grub2-efi-aa64 efibootmgr shim
|
||||
packages-ppc64le:
|
||||
- grub2 ostree-grub2
|
||||
packages-s390x:
|
||||
# On Fedora, this is provided by s390utils-core. on RHEL, this is for now
|
||||
# provided by s390utils-base, but soon will be -core too.
|
||||
- /usr/sbin/zipl
|
||||
packages-x86_64:
|
||||
- grub2 grub2-efi-x64 efibootmgr shim
|
||||
- microcode_ctl
|
||||
|
||||
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
|
||||
@@ -1,11 +0,0 @@
|
||||
# Integration with https://github.com/coreos/bootupd
|
||||
# xref https://github.com/coreos/fedora-coreos-tracker/issues/510
|
||||
packages:
|
||||
- bootupd
|
||||
|
||||
postprocess:
|
||||
- |
|
||||
#!/bin/bash
|
||||
set -xeuo pipefail
|
||||
# Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
|
||||
/usr/bin/bootupctl backend generate-update-metadata
|
||||
@@ -1,3 +0,0 @@
|
||||
# Enable composefs by default.
|
||||
ostree-layers:
|
||||
- overlay/08composefs
|
||||
@@ -1,3 +0,0 @@
|
||||
exclude-packages:
|
||||
- dnf
|
||||
- dnf5
|
||||
@@ -9,19 +9,9 @@ include:
|
||||
- file-transfer.yaml
|
||||
- networking-tools.yaml
|
||||
- user-experience.yaml
|
||||
- shared-workarounds.yaml
|
||||
- shared-el9.yaml
|
||||
- shared-el10.yaml
|
||||
|
||||
conditional-include:
|
||||
# starting from f42, we inherit from tier-x
|
||||
# once we're on f42, we can move this up to the default list of includes above
|
||||
- if: releasever >= 42
|
||||
include: tier-x.yaml
|
||||
# all these are inherited from tier-x in f42+, but we carry them here to
|
||||
# enforce that there's really no coupling until f42
|
||||
- if: releasever < 42
|
||||
include: tier-x-dupes.yaml
|
||||
- tier-x.yaml
|
||||
|
||||
ostree-layers:
|
||||
- overlay/05core
|
||||
|
||||
@@ -17,26 +17,6 @@ conditional-include:
|
||||
- if: prod == false
|
||||
# long-term, would be good to support specifying a nested TreeComposeConfig
|
||||
include: disable-zincati.yaml
|
||||
- if:
|
||||
- basearch != "s390x"
|
||||
# for 42+, it's inherited from fedora-bootc
|
||||
- releasever < 42
|
||||
# And remove some cruft from grub2
|
||||
include: grub2-removals.yaml
|
||||
# On <41, we want to keep making sure dnf doesn't slip in somehow
|
||||
# On 41+, we do want it
|
||||
# https://github.com/coreos/fedora-coreos-tracker/issues/1687
|
||||
- if: releasever < 41
|
||||
include: exclude-dnf.yaml
|
||||
# for 42+, it's inherited from fedora-bootc
|
||||
- if: releasever == 41
|
||||
include: include-dnf.yaml
|
||||
# Wifi firmwares will be dropped in F41
|
||||
- if: releasever < 41
|
||||
include: wifi-firmwares.yaml
|
||||
# for 42+, it's inherited from fedora-bootc
|
||||
- if: releasever == 41
|
||||
include: composefs.yaml
|
||||
- if: releasever >= 41
|
||||
include: selinux-workaround.yaml
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
remove-from-packages:
|
||||
# The grub bits are mainly designed for desktops, and IMO haven't seen
|
||||
# enough testing in concert with ostree. At some point we'll flesh out
|
||||
# the full plan in https://github.com/coreos/fedora-coreos-tracker/issues/47
|
||||
- [grub2-tools, /etc/grub.d/08_fallback_counting,
|
||||
/etc/grub.d/10_reset_boot_success,
|
||||
/etc/grub.d/12_menu_auto_hide,
|
||||
/usr/lib/systemd/.*]
|
||||
@@ -1,17 +0,0 @@
|
||||
# This manifest can go away in Fedora 42. It duplicates tier-x.
|
||||
|
||||
# Modern defaults we want
|
||||
boot-location: modules
|
||||
tmp-is-dir: true
|
||||
|
||||
# Required by Ignition, and makes the system not compatible with Anaconda
|
||||
machineid-compat: false
|
||||
|
||||
remove-from-packages:
|
||||
# We don't want systemd-firstboot.service. It conceptually conflicts with
|
||||
# Ignition. We also inject runtime bits to disable it in systemd-firstboot.service.d/fcos-disable.conf
|
||||
# to make it easier to use systemd builds from git.
|
||||
- [systemd, /usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service]
|
||||
# We don't want auto-generated mount units. See also
|
||||
# https://github.com/systemd/systemd/issues/13099
|
||||
- [systemd-udev, /usr/lib/systemd/system-generators/systemd-gpt-auto-generator]
|
||||
@@ -1,2 +0,0 @@
|
||||
packages:
|
||||
- dnf5
|
||||
@@ -1,8 +0,0 @@
|
||||
# This manifest can go away in Fedora 42. It duplicates tier-x.
|
||||
|
||||
packages:
|
||||
# Standard tools for configuring network/hostname
|
||||
- NetworkManager hostname
|
||||
- iproute
|
||||
# Firewall manipulation
|
||||
- iptables
|
||||
@@ -1,4 +0,0 @@
|
||||
# This manifest is a list of shared workarounds that are needed in both Fedora CoreOS
|
||||
# and downstreams (i.e. Red Hat CoreOS).
|
||||
ostree-layers:
|
||||
- overlay/07fix-selinux-labels
|
||||
@@ -1,14 +0,0 @@
|
||||
# This manifest can go away in Fedora 42. It duplicates tier-x.
|
||||
|
||||
packages:
|
||||
- cryptsetup
|
||||
- e2fsprogs
|
||||
- lvm2
|
||||
- xfsprogs
|
||||
# SELinux policy
|
||||
- selinux-policy-targeted
|
||||
# Allow for configuring different timezones
|
||||
- tzdata
|
||||
# zram-generator (but not zram-generator-defaults) for F33 change
|
||||
# https://github.com/coreos/fedora-coreos-tracker/issues/509
|
||||
- zram-generator
|
||||
@@ -1,11 +0,0 @@
|
||||
# All of these manifests duplicate tier-x. It's meant to be included by streams
|
||||
# which do not yet inherit from it (like FCOS <42, and "traditional" RHCOS)
|
||||
|
||||
include:
|
||||
- bootable-rpm-ostree.yaml
|
||||
- ignition-and-ostree-tier-x-dupes.yaml
|
||||
- system-configuration-tier-x-dupes.yaml
|
||||
- networking-tools-tier-x-dupes.yaml
|
||||
- user-experience-tier-x-dupes.yaml
|
||||
# See https://github.com/coreos/bootupd
|
||||
- bootupd.yaml
|
||||
@@ -1,26 +0,0 @@
|
||||
# This manifest can go away in Fedora 42. It duplicates tier-x.
|
||||
|
||||
# Default to `bash` in our container, the same as other containers we ship.
|
||||
# Note this changes to /sbin/init in f42 as inherited by tier-x.
|
||||
container-cmd:
|
||||
- /usr/bin/bash
|
||||
|
||||
packages:
|
||||
# Basic user tools
|
||||
- bash-completion
|
||||
- coreutils
|
||||
# jq - parsing/interacting with JSON data
|
||||
- jq
|
||||
- less
|
||||
- sudo
|
||||
- vim-minimal
|
||||
# File compression/decompression
|
||||
- tar
|
||||
# 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
|
||||
@@ -1,9 +0,0 @@
|
||||
# Wifi/BT firmware files kept in FCOS until the F41 rebase
|
||||
# See: https://github.com/coreos/fedora-coreos-tracker/issues/1575
|
||||
packages:
|
||||
- atheros-firmware
|
||||
- brcmfmac-firmware
|
||||
- mt7xxx-firmware
|
||||
- nxpwireless-firmware
|
||||
- realtek-firmware
|
||||
- tiwilink-firmware
|
||||
Reference in New Issue
Block a user