Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/skills/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"generated_at": "2026-09-19",
"generated_at": "2026-09-20",
"schema_version": "1.0",
"skills": [
{
Expand Down Expand Up @@ -125,7 +125,7 @@
],
"description": "Bluefin parity contract: verbatim bluefin.toml, utah.toml overlay, [unavailable] rules, repository policy. Use when adding, removing, or debugging packages or parity/check-repos failures.",
"version": "1.0",
"last_updated": "2026-09-18",
"last_updated": "2026-09-20",
"doc_type": "policy"
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/skills/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This file is a human-readable mirror of `index.json`. Both are generated by
`scripts/generate_skill_index.py` — do not hand-edit either file.

Generated: 2026-09-19 · schema 1.0 · 8 skills
Generated: 2026-09-20 · schema 1.0 · 8 skills

| id | category | status | one-line purpose |
|---|---|---|---|
Expand Down
9 changes: 7 additions & 2 deletions docs/skills/package-contract.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: package-contract
version: "1.0"
last_updated: "2026-09-18"
last_updated: "2026-09-20"
id: package-contract
one_line_purpose: Maintain Bluefin package parity and Utah's overlay manifest.
entry_point: docs/skills/package-contract.md
Expand Down Expand Up @@ -91,7 +91,12 @@ annotation (either directly preceding or within the `[section]` header in
ordered by priority (ascending), so rebuilds in `utah-packages` (`priority=1`)
precede base Hummingbird packages (`priority=10`). Repositories without this marker
(such as `nvidia-container-toolkit` or builder-only `fedora-44`) are excluded from
the desktop package transaction.
the desktop package transaction. `packages/nvidia-container.repo` additionally ships
`enabled=0` in every flavor's image, main included — only
`scripts/install-nvidia.sh`, which runs exclusively on the `nvidia`/`nvidia-gaming`
flavors, enables it, and only for the one `dnf install nvidia-container-toolkit`
transaction (`--enablerepo=nvidia-container-toolkit`), so a non-NVIDIA image never
carries an enabled third-party repository (#169).

The pinned package image is an RPM repository, not a runtime dependency: its
contents are copied into the image so the package transaction is reproducible
Expand Down
13 changes: 12 additions & 1 deletion packages/nvidia-container.repo
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,21 @@
# the checksums of the packages. The key is pinned to NVIDIA CORPORATION
# (Open Source Projects), fingerprint
# C95B 321B 61E8 8C18 09C4 F759 DDCA E044 F796 ECB0.
#
# enabled=0: this file is copied into every flavor's /etc/yum.repos.d, not
# just the NVIDIA ones, and Utah's runtime repositories are Hummingbird plus
# the pinned utah-packages factory -- nothing else (see #169). Only
# install-nvidia.sh, which runs exclusively on the nvidia and nvidia-gaming
# flavors, enables it, scoping the enable to that one transaction with
# --enablerepo=nvidia-container-toolkit rather than flipping enabled= in the
# file. That is unlike utah-packages.repo, which starts enabled=1 and is
# flipped to enabled=0 by sed after the flavor step's last install (see
# Containerfile) -- this file is the first repo here to start disabled and
# be enabled per-transaction instead.
[nvidia-container-toolkit]
name=nvidia-container-toolkit
baseurl=https://nvidia.github.io/libnvidia-container/stable/rpm/$basearch
enabled=1
enabled=0
repo_gpgcheck=1
gpgcheck=0
gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey
5 changes: 4 additions & 1 deletion scripts/install-nvidia.sh
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,10 @@ sh "$run_path" --silent --no-kernel-module --no-nouveau-check \
# bundle was one source, not the only one: NVIDIA publishes the toolkit itself,
# from a path with no distribution version in it, and its dependencies are base
# OS libraries Hummingbird already has. See packages/nvidia-container.repo.
"$DNF" -y install nvidia-container-toolkit
# The repository ships enabled=0 in every flavor, this one included, so it is
# never a runtime dependency for images that do not use it (#169); enable it
# only for this one transaction.
"$DNF" -y --enablerepo=nvidia-container-toolkit install nvidia-container-toolkit

# /usr/lib/utah is created by install-ogc-kernel.sh, but that only runs on the
# gaming flavors, so on plain nvidia nothing has made it yet.
Expand Down
12 changes: 12 additions & 0 deletions tests/test_package_resolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,18 @@ def test_package_repository_file_is_enabled_only_during_the_build(self):
self.assertIn("baseurl=file:///etc/utah-packages", text)
self.assertIn("utah-packages", installer.REPOS)

def test_nvidia_container_repo_ships_disabled_and_is_scoped_to_install_nvidia(self):
# #169: the repository used to ship enabled=1 in every flavor's image,
# including non-NVIDIA ones, even though only install-nvidia.sh -- which
# runs exclusively on the nvidia/nvidia-gaming flavors -- installs
# anything from it.
repo = (ROOT / "packages/nvidia-container.repo").read_text()
self.assertIn("enabled=0", repo)
self.assertNotRegex(repo, r"(?m)^enabled=1$")
self.assertIn("repo_gpgcheck=1", repo)
script = (ROOT / "scripts/install-nvidia.sh").read_text()
self.assertIn("--enablerepo=nvidia-container-toolkit", script)

def test_hummingbird_packages_are_signature_checked(self):
text = (ROOT / "packages/hummingbird.repo").read_text()
self.assertIn("gpgcheck=1", text)
Expand Down
Loading