From 31d765bddb78eac0b1cb1e2771e436d05c7da05f Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 17 Sep 2026 16:55:25 +0000 Subject: [PATCH 1/2] fix: restore the bluefin.toml parity contract packages/bluefin.toml is meant to be a byte-for-byte copy of upstream Bluefin's build_files/packages/base.toml. utah.toml says so in as many words -- "it is the parity contract, and any drift there is a parity bug" -- and just check-parity exists to make that loud. It has drifted, so that check is red on main today and every open pull request inherits the failure, #94 and #105 among them. The drift is four hunks: firefox moved into [fedora], and libgda, libgda-sqlite and ppp missing. Syncing the file alone would have been worse than the failure it fixes. All three missing names were measured against both repositories the image actually enables -- the digest-pinned factory metadata layer from Containerfile, and public-hummingbird-x86_64-rpms: libgda absent from both libgda-sqlite absent from both ppp absent from both, and nothing Provides it So a bare sync hands three unresolvable names to the install transaction and turns a failing lint into a failing image build. The sync and the [unavailable] entries have to land together, which is why they are one commit. Each entry carries a tracking issue, as that list requires: libgda, libgda-sqlite (#106) Upstream added both for the maintained Copyous extension (bluefin#1210). Hummingbird carries no package whose name contains gda at all. One factory recipe covers both, because libgda-sqlite is a subpackage of the libgda SRPM rather than its own source -- Fedora's libgda.spec declares %package sqlite alongside ui, tools, sqlcipher, mysql and postgres. ppp (#107) Worth more than dial-up trivia. Hummingbird ships NetworkManager-ppp, both 1.58.0-1.hum1 and 1.58.1-1.hum1, and its metadata carries Requires: ppp. With ppp nowhere in the enabled set that plugin is uninstallable from Hummingbird's own repository, so NetworkManager's PPPoE and PPTP paths cannot be installed at all. It is the same shape as avahi (#104) and nautilus (#100): a plugin shipped without the daemon behind it. firefox needed no handling. It is already in [unavailable], and contract() filters that set out of every section, so moving it between sections cannot put it back in the image -- which matters, because Utah ships org.mozilla.firefox as a Flatpak and re-adding the RPM would regress that decision. This change installs nothing new and removes nothing. Proven rather than argued: contract() over main's two files and over this branch's both return the same 74 packages, with no additions and no removals, and libgda, libgda-sqlite, ppp and firefox are each absent from the resulting set. 23 tests pass, 45 subtests pass. The parity diff against upstream is now empty, the RPM contract check reports 58 Bluefin, 10 GNOME and 5 service packages, and install-packages.py's own guard confirms no [unavailable] package appears in the install set. Noted but deliberately not changed: evolution-ews-core, fish and zsh predate this and carry no issue reference, so the "every entry MUST carry a tracking issue" rule is not currently enforced by anything. Worth a guard, but not in a commit whose job is restoring the contract. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01W6BYLUD6KBzF8rBFXKjP7M --- packages/bluefin.toml | 6 +++++- packages/utah.toml | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/bluefin.toml b/packages/bluefin.toml index 8d5ef38f5..4003ddd1b 100644 --- a/packages/bluefin.toml +++ b/packages/bluefin.toml @@ -46,7 +46,6 @@ packages = [ "firewall-config", "fish", "flatpak-spawn", - "firefox", "fzf", "gcc", "gcc-c++", @@ -71,6 +70,9 @@ packages = [ "libblockdev-mpath", "libcamera-gstreamer", "libcamera-tools", + # Runtime dependencies for the maintained Copyous extension (#1210). + "libgda", + "libgda-sqlite", "libratbag-ratbagd", "libva-utils", "libxcrypt-compat", @@ -82,6 +84,7 @@ packages = [ "openrgb-udev-rules", "openssh-askpass", "pipewire-libs-extra", + "ppp", "python3-gnome-ponytail-daemon", "slitherer", "squashfs-tools", @@ -120,6 +123,7 @@ packages = [ "fedora-chromium-config", "fedora-chromium-config-gnome", "fedora-third-party", + "firefox", "firefox-langpacks", "gnome-extensions-app", "gnome-shell-extension-background-logo", diff --git a/packages/utah.toml b/packages/utah.toml index ac9b02fde..75c312533 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -133,6 +133,23 @@ packages = [ # its Qt WebEngine dependency closure. Match the factory's installer policy # until that path is supported; tracked by #83. # +# libgda, libgda-sqlite +# Upstream added both as runtime dependencies for the maintained Copyous +# extension (bluefin#1210). Neither is in the pinned factory image or in +# public-hummingbird-x86_64-rpms -- Hummingbird carries no package whose +# name contains gda at all. One factory recipe would cover both, because +# libgda-sqlite is a subpackage of the libgda SRPM rather than its own +# source. Tracked by #106. +# +# ppp +# In neither repository, and nothing in either Provides it. This one costs +# more than dial-up: Hummingbird ships NetworkManager-ppp (1.58.0-1.hum1 +# and 1.58.1-1.hum1) whose metadata carries Requires: ppp, so that plugin +# is uninstallable from their own repository and NetworkManager's PPPoE and +# PPTP paths cannot be installed at all. The same shape as avahi (#104) and +# nautilus (#100): a plugin shipped without the daemon behind it. +# Tracked by #107. +# # grub2-efi-x64-cdboot and pipewire-libs-extra are supplied by the pinned # September 10 factory candidate and return to the install contract (#35). packages = [ @@ -140,6 +157,9 @@ packages = [ "evolution-ews-core", "firefox", "fish", + "libgda", + "libgda-sqlite", + "ppp", "slitherer", "zsh", ] From 3ad95566593548ecef343585725825f7db6afe9e Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 18 Sep 2026 01:38:19 +0000 Subject: [PATCH 2/2] fix(e2e): capture the fastfetch shot at 1080p, with its logo The screenshot on the repository front page is the project's end-to-end evidence, and it was about to lose Utah's branding. #84 added fastfetch --logo none to the session bashrc, which suppresses the logo outright. The committed screenshot predates that change and still has the Utahraptor in it, so the next passing run would have quietly replaced it with a logo-less one. The workaround was reasonable, because the logo genuinely did not fit. fastfetch needs about 90 columns with it -- roughly 33 for the logo column plus a ~57 character detail line -- and Ghostty opens at 80x24, so lines like KVM/QEMU Standard PC (Q35 + ICH9, 2009) (pc-q35-11.1) wrapped to column 0 and pushed fastfetch's own header off the top of the window. The committed screenshot shows exactly that: its first visible line is the tail of a wrapped one, and the OS identity line is scrolled away. Columns are the lever, and point size on its own is not. Ghostty sizes its window in cells, so a smaller font yields a smaller window with the same 80 columns and the same wrap -- it would have traded the wrap for worse OCR and fixed nothing. What buys the columns is the display: both VMs now ask for 1920x1080 instead of the 1280x800 the machine default gave, and at that size a 110-column window at 12pt is about 880px of 1920. The logo fits with room to spare and the font goes UP from the default rather than down, which helps the tesseract gate that reads UTAH-E2E-FASTFETCH and Kernel out of the image. xres/yres are the EDID preferred-mode hints QEMU passes to the guest. -vga none replaces the machine default with the same stdvga device rather than a different adapter, so the graphics path is unchanged -- this is a mode hint, not a driver swap. Applied to the live VM as well as the installed one, since live-desktop.png is published in the same record. Ghostty is a flatpak here, and which config path it honours depends on whether the sandbox exposes xdg-config or keeps its own per-app directory, so the geometry is written to both ~/.config/ghostty/config and ~/.var/app//config/ghostty/config rather than guessing. Everything is overridable: UTAH_E2E_DISPLAY_WIDTH, UTAH_E2E_DISPLAY_HEIGHT, UTAH_E2E_FONT_SIZE, UTAH_E2E_COLUMNS, UTAH_E2E_ROWS. Verified what can be verified without a hypervisor. The remote script was rendered through a stub ssh_target and executed against a throwaway HOME: it writes both ghostty configs with the expected three keys, writes the autostart entry, and leaves `fastfetch && echo UTAH-E2E-FASTFETCH` in bashrc with no --logo none. VGA_ARGS expands to exactly four argv entries, so no word splitting. All shell scripts parse; 23 tests and 45 subtests pass. NOT verified here: that QEMU accepts VGA.xres/yres in this build, and that the guest picks 1920x1080 from the EDID hint. There is no hypervisor in this environment. Both fail loudly rather than silently if wrong -- a rejected device property aborts the VM at startup, and a display that stayed at 1280x800 would still wrap and fail the OCR gate. Separately noted, not fixed: docs/verification/screenshots/installed-desktop.png and installed-fastfetch.png are currently byte-identical (cd6577d6...). The desktop shot is taken after the terminal autostart has already mapped fastfetch, so two named checkpoints record one frame. That is a question about what installed-desktop is meant to prove, not about font size, so it is left alone here. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01W6BYLUD6KBzF8rBFXKjP7M --- iso/scripts/luks-e2e.sh | 43 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/iso/scripts/luks-e2e.sh b/iso/scripts/luks-e2e.sh index a2aa70196..8199e8a55 100755 --- a/iso/scripts/luks-e2e.sh +++ b/iso/scripts/luks-e2e.sh @@ -37,6 +37,32 @@ TEST_PASSWORD="${UTAH_E2E_PASSWORD:-utahtest}" # falling back. TERMINAL_APP="${UTAH_E2E_TERMINAL:-com.mitchellh.ghostty}" +# Display size and terminal geometry for the screenshots. These exist because +# fastfetch with its logo needs about 90 columns -- roughly 33 for the logo +# column plus a ~57 character detail line -- while Ghostty opens at 80x24. The +# detail lines wrapped and pushed fastfetch's own header off the top of the +# window, which is what #84 worked around by dropping the logo entirely with +# --logo none. The shot is the evidence on the repository front page, so it +# should carry the branding rather than hide it. +# +# Columns are the lever, not point size: Ghostty sizes its window in cells, so +# a smaller font alone gives a smaller window with the same 80 columns and the +# same wrap. What buys the columns is the display -- at 1920x1080 a 110-column +# window at 12pt is roughly 880px of 1920, so the logo fits with room to spare +# and the font stays large enough for the tesseract gate below to read. Doing +# this by shrinking the font on a 1280x800 screen would have traded the wrap +# for worse OCR. 35 rows keeps all of fastfetch on screen without scrolling. +# +# xres/yres are the EDID hints QEMU passes to the guest for a preferred mode; +# -vga none replaces the machine default with the same stdvga device rather +# than a different adapter, so nothing about the graphics path changes. +DISPLAY_WIDTH="${UTAH_E2E_DISPLAY_WIDTH:-1920}" +DISPLAY_HEIGHT="${UTAH_E2E_DISPLAY_HEIGHT:-1080}" +VGA_ARGS=(-vga none -device "VGA,xres=${DISPLAY_WIDTH},yres=${DISPLAY_HEIGHT}") +TERMINAL_FONT_SIZE="${UTAH_E2E_FONT_SIZE:-12}" +TERMINAL_COLUMNS="${UTAH_E2E_COLUMNS:-110}" +TERMINAL_ROWS="${UTAH_E2E_ROWS:-35}" + ISO="$(realpath "${ISO}")" mkdir -p "${WORK}" SHOTS="${WORK}/screenshots" @@ -189,6 +215,7 @@ cp -f "${OVMF_VARS_SRC}" "${VARS}" "${QEMU}" \ -machine q35 -cpu host -m "${VM_RAM}" -smp "${VM_CPUS}" ${ACCEL} \ + "${VGA_ARGS[@]}" \ -drive "if=pflash,format=raw,readonly=on,file=${OVMF_CODE}" \ -drive "if=pflash,format=raw,file=${VARS}" \ -drive "if=none,id=iso,file=${ISO},media=cdrom,readonly=on,format=raw" \ @@ -389,6 +416,7 @@ echo "=== Phase 4/6: boot the installed disk ===" cp -f "${VARS}" "${WORK}/ovmf-vars-installed.fd" "${QEMU}" \ -machine q35 -cpu host -m "${VM_RAM}" -smp "${VM_CPUS}" ${ACCEL} \ + "${VGA_ARGS[@]}" \ -drive "if=pflash,format=raw,readonly=on,file=${OVMF_CODE}" \ -drive "if=pflash,format=raw,file=${WORK}/ovmf-vars-installed.fd" \ -drive "if=none,id=disk,file=${INSTALL_DISK},format=qcow2" \ @@ -468,7 +496,20 @@ shot installed-greeter "${MONITOR_INSTALLED}" # runs inside the session with a bus and a display of its own. echo "Arranging for a terminal to open in the session..." ssh_target " - grep -q 'utah-e2e fastfetch' ~/.bashrc 2>/dev/null || printf '%s\n' '[[ \$- == *i* ]] && { fastfetch --logo none && echo UTAH-E2E-FASTFETCH; } # utah-e2e fastfetch' >> ~/.bashrc + grep -q 'utah-e2e fastfetch' ~/.bashrc 2>/dev/null || printf '%s\n' '[[ \$- == *i* ]] && { fastfetch && echo UTAH-E2E-FASTFETCH; } # utah-e2e fastfetch' >> ~/.bashrc + # Ghostty is a flatpak here, and which config path it reads depends on + # whether the sandbox exposes xdg-config or keeps its own per-app dir, so + # write both rather than guess. An unknown key would only be warned about, + # and a geometry that failed to apply shows up as the OCR gate failing + # rather than as a quietly bad screenshot. + for _cfgdir in ~/.config/ghostty ~/.var/app/${TERMINAL_APP}/config/ghostty; do + mkdir -p \"\${_cfgdir}\" + cat > \"\${_cfgdir}/config\" < ~/.config/autostart/${TERMINAL_APP}.desktop <