Merge branch 'branch-f42' into 'main'

tier-1: add f42 treefile after branching See merge request fedora/bootc/base-images!87
Merge branch 'drop-resolved-centos' into 'main'
2025-02-07 19:32:10 +00:00 · 2025-02-07 14:35:47 +00:00 · 2025-02-07 09:23:38 -05:00 · 2025-02-05 16:44:49 -05:00 · 2025-02-05 21:08:36 +00:00 · 2025-02-05 15:16:59 -05:00
5 changed files with 13 additions and 4 deletions
@@ -0,0 +1,6 @@
+# NB: This treefile is used by the legacy pungi path only to build tier-1. It
+# will be removed in the future.
+releasever: 42
+repos:
+  - fedora-devel
+include: fedora-bootc.yaml
@@ -5,3 +5,5 @@ variables:
 packages:
  # https://gitlab.com/fedora/bootc/base-images/-/issues/12
  - fedora-repos-archive
+  # Not in RHEL10
+  - systemd-resolved
@@ -26,3 +26,8 @@ postprocess:
    set -xeuo pipefail
    # Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
    /usr/bin/bootupctl backend generate-update-metadata
+  - |
+    #!/bin/bash
+    # Workaround for https://issues.redhat.com/browse/RHEL-78104
+    set -xeuo pipefail
+    rm -vrf /usr/lib/ostree-boot/loader
@@ -4,13 +4,10 @@ postprocess:
    #!/usr/bin/env bash
    set -xeuo pipefail
    source /usr/lib/os-release
-    # Check if the ID is Fedora and VERSION_ID is 42 or higher
-    if [[ "$ID" == "fedora" && "$VERSION_ID" -ge 42 ]]; then
    echo -e "# kernel-install will not try to run dracut and allow rpm-ostree to\n\
    # take over. Rpm-ostree will use this to know that it is responsible\n\
    # to run dracut and ensure that there is only one kernel in the image\n\
    layout=ostree" | tee /usr/lib/kernel/install.conf > /dev/null
-    fi
    # By default dnf keeps multiple versions of the kernel, with this
    # configuration we tell dnf to treat the kernel as everything else.
    # https://dnf.readthedocs.io/en/latest/conf_ref.html#main-options
@@ -28,7 +28,6 @@ packages:
  - NetworkManager
  - openssh-clients
  - openssh-server
-  - systemd-resolved
  # 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
Author	SHA1	Message	Date
Colin Walters (Red Hat)	7b4e013126	Merge branch 'branch-f42' into 'main' tier-1: add f42 treefile after branching See merge request fedora/bootc/base-images!87	2025-02-07 19:32:10 +00:00
Colin Walters (Red Hat)	c1a4b38c46	Merge branch 'drop-resolved-centos' into 'main' tier-x: Drop systemd-resolved See merge request fedora/bootc/base-images!88	2025-02-07 14:35:47 +00:00
Colin Walters	0ac5ee04ba	tier-x: Drop systemd-resolved It's not desired by default in RHEL 10 or below yet, ref https://issues.redhat.com/browse/RHEL-77077 AFAICS, it's already explicitly specified in the fedora-coreos manifest, so dropping it here shouldn't affect FCOS. Of course I think what we really want here is distribution conditionals. Signed-off-by: Colin Walters <walters@verbum.org>	2025-02-07 09:23:38 -05:00
Paul Whalen	da3c6ef677	tier-1: add f42 treefile after branching Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>	2025-02-05 16:44:49 -05:00
Colin Walters (Red Hat)	5276e451f4	Merge branch 'drop-ppc64le-bootloader-cruft' into 'main' base/bootloader: Drop /usr/lib/ostree-boot/loader See merge request fedora/bootc/base-images!86	2025-02-05 21:08:36 +00:00
Colin Walters	3ebf803f5f	base/bootloader: Drop /usr/lib/ostree-boot/loader A quick workaround for https://issues.redhat.com/browse/RHEL-78104	2025-02-05 15:16:59 -05:00
Joseph Marrero Corchado	e62452d096	Merge branch 'kernel-install-more-places' into 'main' kernel-install: Enable everywhere See merge request fedora/bootc/base-images!84	2025-02-03 19:05:14 +00:00
Colin Walters	d88208bfba	kernel-install: Enable everywhere Since we'll have the updated rpm-ostree and we believe this works. Signed-off-by: Colin Walters <walters@verbum.org>	2025-02-03 09:05:06 -05:00