diff --git a/fedora-candidate-compose.repo b/fedora-candidate-compose.repo new file mode 100644 index 0000000000..b408da256f --- /dev/null +++ b/fedora-candidate-compose.repo @@ -0,0 +1,21 @@ +# This yum repo entry represents the latest candidate compose for the given +# Fedora release. During prep for final release some release blockers and +# freeze exceptions are actually built in candidate composes first to +# qualify them before they are promoted to the other repos. In order to pick +# these packages up ASAP we'll pull from the latest candidate compose +# as well. Note that if a package doesn't pass testing it will get +# demoted from a later canddiate compose and never promoted to stable +# repos. In this case a later bump-lockfile run will revert ot the +# older NVR package that is currently in the stable repos. This should address: +# https://github.com/coreos/fedora-coreos-tracker/issues/1602 + +[fedora-candidate-compose] +name=Fedora Candidate Compose $releasever - $basearch +baseurl=https://kojipkgs.fedoraproject.org/compose/$releasever/latest-Fedora-$releasever/compose/Everything/$basearch/os/ +enabled=1 +#metadata_expire=7d +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +skip_if_unavailable=False diff --git a/kola-denylist.yaml b/kola-denylist.yaml index 7bf0fab079..340ec40f2e 100644 --- a/kola-denylist.yaml +++ b/kola-denylist.yaml @@ -17,13 +17,13 @@ - testing-devel - pattern: coreos.ignition.ssh.key tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1553 - snooze: 2023-10-31 + snooze: 2023-11-15 warn: true platforms: - azure - pattern: ext.config.docker.basic tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1578 - snooze: 2023-10-31 + snooze: 2023-11-15 warn: true streams: - rawhide diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json index d71180f47e..288b5e2a1e 100644 --- a/manifest-lock.aarch64.json +++ b/manifest-lock.aarch64.json @@ -37,6 +37,7 @@ "evra": "1.25-1.fc39.aarch64" }, "amd-gpu-firmware": { + "evra": "20231030-1.fc39.noarch" }, "amd-ucode-firmware": { diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml index 85c79b2ea2..dfc8f19c00 100644 --- a/manifest-lock.overrides.yaml +++ b/manifest-lock.overrides.yaml @@ -25,4 +25,4 @@ packages: metadata: bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-24872e50a0 reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468 - type: fast-track \ No newline at end of file + type: fast-track diff --git a/manifests/bootable-rpm-ostree.yaml b/manifests/bootable-rpm-ostree.yaml index fdb9c8b078..9d5faddbec 100644 --- a/manifests/bootable-rpm-ostree.yaml +++ b/manifests/bootable-rpm-ostree.yaml @@ -1,12 +1,11 @@ -# This minimal base starts just from: kernel + systemd + rpm-ostree + bootloader. +# 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: - # Kernel + systemd. - - kernel systemd + - 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 diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index d48601af17..8a4f83f3d9 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -3,6 +3,7 @@ # core functionality. include: + - kernel.yaml - system-configuration.yaml - ignition-and-ostree.yaml - file-transfer.yaml diff --git a/manifests/kernel.yaml b/manifests/kernel.yaml new file mode 100644 index 0000000000..1b1f1a4e29 --- /dev/null +++ b/manifests/kernel.yaml @@ -0,0 +1,3 @@ +packages: + # We use the default kernel package, but note c9s may differ + - kernel diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator index e7d1d688c3..51d61cbc30 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator @@ -13,6 +13,7 @@ set -e exec 1>/dev/kmsg; exec 2>&1 UNIT_DIR="${1:-/tmp}" +EARLY_DIR="${2:-/tmp}" IFS=" " read -r -a cmdline <<< "$( "${UNIT_DIR}/coreos-ignition-setup-user.service.d/diskful.conf" <