From aad424218a7cfe00733c89cf004e90c0b87f0b73 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 30 2024 18:20:19 +0000 Subject: [PATCH 1/6] Revert "ci: Temporarily skip building the base variant" This reverts commit 6467c0ab326d482022509e6ba9b8cca5b1220b19. --- diff --git a/ci/validate.yaml b/ci/validate.yaml index 36799ce..be7ae1b 100644 --- a/ci/validate.yaml +++ b/ci/validate.yaml @@ -86,15 +86,10 @@ # Still run the next step if this one fails ignore_errors: true - - name: Perform dependency resolution for the base variant - ansible.builtin.shell: + - name: Compose the base variant + ansible.builtin.command: chdir: "{{ zuul.project.src_dir }}" - cmd: "just compose-dry-run base-atomic" - - # - name: Compose the base variant - # ansible.builtin.command: - # chdir: "{{ zuul.project.src_dir }}" - # cmd: just compose-image base-atomic + cmd: just compose-image base-atomic - name: Check if any previous dependency resolution steps failed ansible.builtin.shell: From 7464c151c1c8674cf41483efd57cee7daa88a8a3 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 30 2024 18:20:19 +0000 Subject: [PATCH 2/6] ci: Manually install python3-libdnf5 first See: https://pagure.io/fedora-ci/general/issue/474 --- diff --git a/ci/validate.yaml b/ci/validate.yaml index be7ae1b..eaa665f 100644 --- a/ci/validate.yaml +++ b/ci/validate.yaml @@ -1,5 +1,9 @@ - hosts: all tasks: + - name: Install system dependencies + shell: dnf install -y python3-libdnf5 + become: true + - name: Upgrade all packages ansible.builtin.dnf: name: "*" From 9d0caa8c9d7723812fa0725125cd1605ecb33a09 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 30 2024 18:20:19 +0000 Subject: [PATCH 3/6] zuul: Waiting for F41 cloud images --- diff --git a/.zuul.yaml b/.zuul.yaml index 8779dc8..dd7452a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -14,6 +14,5 @@ - name: vm # Replace by a fixed version label after branching, once available: # https://fedora.softwarefactory-project.io/zuul/labels - # See: https://pagure.io/fedora-ci/general/issue/474 - # label: cloud-fedora-rawhide-medium + # label: cloud-fedora-41-medium label: cloud-fedora-40-medium From b755fffbf02c39fe4d8851c5cafdf83f57e06e36 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 30 2024 18:20:19 +0000 Subject: [PATCH 4/6] comps-sync-exclude-list: glibc-all-langpacks is always included There is no need for each variant to include glibc-all-langpacks as it is included for everyone in the common-packages.yaml manifest. See: https://pagure.io/fedora-comps/pull-request/1017 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index ce676ba..3d1df31 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -183,6 +183,11 @@ desktop_exclude_list: - initial-setup-gui # Already included in all Atomic Desktops by default - toolbox + # Already included by default for all variants + - glibc-all-langpacks + kde-mobile: + # Already included by default for all variants + - glibc-all-langpacks xfce-desktop: # Incompatible with ostree for various reasons - abrt-desktop diff --git a/kinoite-packages.yaml b/kinoite-packages.yaml index a53d907..1dd8ea9 100644 --- a/kinoite-packages.yaml +++ b/kinoite-packages.yaml @@ -15,7 +15,6 @@ packages: - firewall-config - flatpak-kcm - fprintd-pam - - glibc-all-langpacks - kaccounts-integration-qt6 - kcharselect - kde-connect From 13527685ce65e81dab197cc009fbe4944fc61486 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 30 2024 18:20:19 +0000 Subject: [PATCH 5/6] common: Add workaround for issue with newer GRUB2 New GRUB2 config modules are causing issues on Atomic Desktops systems as the new GRUB2 config get regenerated with new options that are not supported by the currently installed version of GRUB2. The root cause is that we don't (yet) systematically update the bootloader on Atomic Desktops. This is related to: https://gitlab.com/fedora/ostree/sig/-/issues/1 Temporarily remove / modify those config modules from the GRUB2 set of configs used to generate the final GRUB2 config, until we are able to enable bootloader updates by default. See: https://github.com/fedora-silverblue/issue-tracker/issues/587 See: https://bugzilla.redhat.com/show_bug.cgi?id=2305291 --- diff --git a/common.yaml b/common.yaml index b16245b..a7f27c2 100644 --- a/common.yaml +++ b/common.yaml @@ -15,6 +15,8 @@ include: - initramfs.yaml # Read only sysroot - sysroot-ro.yaml + # Workaround for https://github.com/fedora-silverblue/issue-tracker/issues/587 + - grub2-workaround.yaml # systemd-pcrphase module fails on ppc64le: # https://gitlab.com/fedora/ostree/sig/-/issues/44 diff --git a/grub2-workaround.yaml b/grub2-workaround.yaml new file mode 100644 index 0000000..3b58a9e --- /dev/null +++ b/grub2-workaround.yaml @@ -0,0 +1,22 @@ +# Temporarily disable new GRUB2 config options until we can ensure that we +# have an updated bootloader via bootupd. +# This is workaround for: https://bugzilla.redhat.com/show_bug.cgi?id=2305291 +# See: https://github.com/fedora-silverblue/issue-tracker/issues/587 +postprocess: + - | + #!/usr/bin/env bash + set -xeuo pipefail + + # Completely disable this module + sed -i '2i exit 0' /etc/grub.d/25_bli + + # Skip check that was not performed in previous Fedora versions + sed -i '/fwsetup --is-supported/d' /etc/grub.d/30_uefi-firmware + sed -i '/\tif/d' /etc/grub.d/30_uefi-firmware + sed -i '/\tfi/d' /etc/grub.d/30_uefi-firmware + sed -i 's/\t\t/\t/' /etc/grub.d/30_uefi-firmware + + # Verify that the content matches what we expect the file to look like. + # This will fail the build here instead of breaking users' systems. + hash="5a77a16c6a94e664e2e96a870f4531b9a0b4e63be1f46751d01e774629a8c84b" + echo "$hash /etc/grub.d/30_uefi-firmware" | sha256sum -c From bc14d08186cf46c44f69ed51f3c1a72c33eb562a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 30 2024 18:20:19 +0000 Subject: [PATCH 6/6] Revert "common: Use add-determinism as workraround for pyc mtime mismatch" This is causing issues when layering packages from different architectures that include Python scripts. See: https://github.com/fedora-silverblue/issue-tracker/issues/590 See: https://bugzilla.redhat.com/show_bug.cgi?id=2308663 See: https://gitlab.com/fedora/bootc/tracker/-/issues/3 See: https://gitlab.com/fedora/ostree/sig/-/issues/52 This reverts commit 36c70e09eaa4ab07d3abbfa6d67dea140cc0d403. --- diff --git a/common.yaml b/common.yaml index a7f27c2..8de00a5 100644 --- a/common.yaml +++ b/common.yaml @@ -79,8 +79,6 @@ packages: # Always include at least full English language support by default # https://gitlab.com/fedora/ostree/sig/-/issues/14 - langpacks-en - # Workaround for https://github.com/ostreedev/ostree/issues/1469 - - add-determinism # Kept for backward compatibility for AppImages # See: https://gitlab.com/fedora/ostree/sig/-/issues/50 - fuse @@ -167,6 +165,3 @@ postprocess: # Fix triggerin for samba-client in cups package (not supported by rpm-ostree yet) # https://github.com/fedora-silverblue/issue-tracker/issues/532 ln -snf /usr/libexec/samba/cups_backend_smb /usr/lib/cups/backend/smb - - # Workaround for https://github.com/ostreedev/ostree/issues/1469 - add-determinism -j --handler pyc-zero-mtime /usr