Skip to content

feat: import Utah runtime dependencies with no factory recipe - #246

Merged
hanthor merged 1 commit into
mainfrom
import/utah-runtime-deps
Sep 25, 2026
Merged

hanthor merged 1 commit into
mainfrom
import/utah-runtime-deps

Conversation

@hanthor

@hanthor hanthor commented Sep 24, 2026

Copy link
Copy Markdown
Member

Imports 11 Fedora Rawhide recipes that the Utah image needs. None has a factory recipe, and Hummingbird ships none of them. All 11 are in Fedora 44.

Package Needed by Stage Source0
totem-pl-parser localsearch 1 download.gnome.org (+ sha256_url)
libmtp gvfs-mtp 0 GitHub release
libgphoto2 gvfs-gphoto2 0 GitHub release (fallback: SourceForge)
usbmuxd gvfs-afc, libimobiledevice-utils 1 GitHub archive at the pinned commit
libtatsu gvfs-afc, libimobiledevice-utils (through libimobiledevice) 1 GitHub release
libqrtr-glib ModemManager 1 gitlab.freedesktop.org archive
libmbim ModemManager 1 gitlab.freedesktop.org archive
libqmi ModemManager 2 gitlab.freedesktop.org archive
gpm vim-enhanced 0 generated from the upstream .tar.lzma (see below)
poppler-data poppler 0 poppler.freedesktop.org
dmidecode lm_sensors 0 download.savannah.gnu.org

Every URL-sourced entry matches the SHA-512 in the imported sources file. Fedora's lookaside is listed only in fallback_urls. tools/source_pipeline.py accepted all 11 locally.

Stages

Each stage is one above the recipe's highest factory BuildRequires:

  • totem-pl-parser, libmbim: gobject-introspection (0)
  • libqrtr-glib: gobject-introspection, libgudev (0)
  • libtatsu: libplist (0)
  • usbmuxd: libimobiledevice, libplist (0)
  • libqmi: libmbim, libqrtr-glib (1)

The other five have no factory BuildRequires. gvfs (3) and localsearch (4) already sit above their new providers.

gpm: generated Source0

Fedora's gpm-1.20.7.tar.xz is the upstream release repacked by hand without doc/specs, because those PDFs have unclear licensing (the spec says so above its Source: line). It is pinned by MD5 and exists only in the lookaside, so no upstream URL serves those bytes. This PR:

  • adds _gpm_transform to tools/generated_sources.py: it takes the SHA-512-pinned upstream gpm-1.20.7.tar.lzma, drops doc/specs, and writes a sorted, ownerless, single-stream xz
  • locks gpm as a generate entry, the same way intel-media-driver-free is locked
  • repins packages/gpm/sources to the generated digest

The generated tree is identical to Fedora's archive (diff -r), and two runs produce the same bytes. The PR adds unit tests for the transform and for the lock, and a note in docs/contributing.md.

Build-root notes

  • All BuildRequires resolve in Fedora 44 + Hummingbird (checked with rpmspec -q --buildrequires + dnf repoquery in fedora:44 with config/hummingbird.repo).
  • No Rust crates, no rawhide-only compat packages, and no nettle 4 use. Every %changelog and changelog file is in descending order with matching weekdays.
  • dmidecode's sources still lists a stale dmidecode-3.6.tar.xz, so the bundled-source path downloads it from the lookaside. It is unused and harmless, and the recipe is kept as imported.
  • Consumers left for a follow-up: ModemManager and fwupd (stage 0) BuildRequire libqmi, libmbim, and libqrtr-glib, and libimobiledevice (stage 0) BuildRequires libtatsu. Until they are restaged they link Fedora 44's builds of the same versions, so the sonames are identical and nothing breaks today. Strictly, repeated-mistakes rule 3 wants them in a later stage. Moving them cascades to upower, usbmuxd, and consumers of fwupd and ModemManager, and would invalidate published builds, so it belongs in its own PR.

Counts

371 -> 382 recipes, and 70 -> 76 hand-assigned stages. Updated the tests and docs/architecture.md.

Conflicts with #239 (gnome-initial-setup, 371 -> 372) in the same count assertions. Rebase this PR after #239 merges; the counts then become 383, 382, and 77 of 383.

Validation: just factory-check validate workflow-quoting runtime-contract passes, and so does pytest tests (496 passed). pre-commit fails only on actionlint, which also fails on main in build-stage.yml and rebuild-rpms.yml; this PR doesn't touch either file. No workflows were dispatched and nothing was built locally.

🤖 Generated with Claude Code

hanthor added a commit that referenced this pull request Sep 25, 2026
The publish gate installs the bluefin-packages.toml contract using only this
factory and Hummingbird, and run 36073571248 failed it: libosinfo requires
osinfo-db and osinfo-db-tools, and ffmpeg-free's libraries link sonames that
neither repository provides. The build root had resolved them from Fedora 44,
which the consumer transaction cannot see.

Import the Fedora Rawhide recipes for the 13 source packages the closure
still needs:

- osinfo-db, osinfo-db-tools (libosinfo)
- libass, libunibreak, libbs2b, libmysofa, vid.stab, zimg, rubberband,
  libsamplerate (libavfilter-free)
- tinyxml2 (libmediainfo links libtinyxml2.so.11)
- openpgm (Hummingbird's zeromq requires libpgm-5.3.so.0, and libavformat
  links libzmq)
- poppler-data (Hummingbird's poppler requires it; same entry as #246)

Each Source0 comes from the upstream release URL and matches the SHA-512 in
the imported `sources` file. The Fedora lookaside is a fallback only. The
libbs2b `sources` pinned only an MD5, so repin it to the SHA-512 of the same
upstream bytes (the MD5 matches). tools/import_rawhide.py now accepts dots in
package names so that vid.stab can be imported.

Disable the ffmpeg-free features whose libraries are in neither Hummingbird
nor the factory, the same way librabbitmq was already dropped. None of them
is in the Utah contract:

- tesseract (OCR filter; would need tesseract, leptonica, tessdata)
- lv2/lilv (LV2 host; would need lilv, serd, sord, sratom, zix)
- libqrencode (no upstream URL serves 4.1.1's release tarball any more)
- openal (Fedora repacks openal-soft by hand; no upstream serves those bytes)
- libcaca (would need libcaca, slang, freeglut)
- dc1394, which also covers libiec61883 (libdc1394, libiec61883,
  libavc1394, libraw1394)
- libklvanc

Stages sit one above each recipe's highest factory BuildRequires:
libunibreak, libmysofa, zimg, tinyxml2, openpgm and poppler-data at 0;
libass, libbs2b, vid.stab, libsamplerate and osinfo-db-tools at 1;
rubberband and osinfo-db at 2. libosinfo BuildRequires osinfo-db, so it
moves from 0 to 3. ffmpeg stays at 3, above all its new inputs, so nothing
that consumes it has to move.

The recipe set grows from 373 to 386, so update the count assertions and
docs/architecture.md.


Claude-Session: https://claude.ai/code/session_01QMTLsnqW2jtz5QsNC3W3qv

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@hanthor

hanthor commented Sep 25, 2026

Copy link
Copy Markdown
Member Author

Notes for the rebase after #239 (the cluster order is #239, #225, this PR, then #233):

Utah installs packages whose dependencies neither Hummingbird nor this
factory builds. Import the Fedora Rawhide recipes for the eleven source
packages behind them:

- totem-pl-parser (localsearch)
- libmtp (gvfs-mtp), libgphoto2 (gvfs-gphoto2)
- usbmuxd, libtatsu (gvfs-afc, libimobiledevice-utils)
- libqrtr-glib, libmbim, libqmi (ModemManager)
- gpm (vim-enhanced), poppler-data (poppler), dmidecode (lm_sensors)

Each Source0 comes from the upstream release URL and matches the SHA-512
in the imported `sources` file, with the lookaside as a fallback only.

gpm is the exception: Fedora repacks the upstream tarball without
doc/specs (PDFs with unclear licensing) and pins the hand-made result by
MD5, so no upstream URL serves those bytes. Add a deterministic gpm
transformation to tools/generated_sources.py from the SHA-512-pinned
upstream gpm-1.20.7.tar.lzma, lock it as a `generate` entry, and repin
packages/gpm/sources to the generated digest. The generated tree is
identical to Fedora's archive.

Stages sit one above each recipe's highest factory BuildRequires:
totem-pl-parser, libqrtr-glib and libmbim at 1 (gobject-introspection,
libgudev), libtatsu and usbmuxd at 1 (libplist, libimobiledevice), and
libqmi at 2 (libmbim, libqrtr-glib).

The recipe set grows from 371 to 382, so update the count assertions and
docs/architecture.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QMTLsnqW2jtz5QsNC3W3qv
@hanthor
hanthor marked this pull request as ready for review September 25, 2026 16:15
@hanthor
hanthor force-pushed the import/utah-runtime-deps branch from 14154e2 to 7f8768e Compare September 25, 2026 16:15
@hanthor

hanthor commented Sep 25, 2026

Copy link
Copy Markdown
Member Author

Rebased onto main after #249 and #239. poppler-data is dropped from this PR because #249 already imported it with the same entry. gpm's generator is merged alongside the pydantic-core one in tools/generated_sources.py. Counts are now 397 recipes / 396 targets / 87 staged. Tests pass (500) and just check is clean.

@hanthor
hanthor merged commit 3bd9582 into main Sep 25, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant