From 31d765bddb78eac0b1cb1e2771e436d05c7da05f Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 17 Sep 2026 16:55:25 +0000 Subject: [PATCH] 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", ]