From fed9cf606b0f0131c7f4add35b24c46c856ed50f Mon Sep 17 00:00:00 2001 From: Tom Barber Date: Fri, 25 Sep 2026 16:38:07 +0000 Subject: [PATCH 1/2] fix(packages): install samba, samba-winbind and samba-winbind-clients Rebased onto main (past #266's count bump to 60 and #265). Address review feedback from hanthor: - rebased to resolve the conflict with main - regenerated site/data/packages.json with scripts/generate-site-data.py instead of hand-editing (117 -> 120 installed once samba/winbind/ winbind-clients are added on top of samba-client/samba-common-tools) - updated README.md and package-contract.md counts to match (60 -> 63 Utah additions), verified with scripts/check-doc-counts.py --- README.md | 2 +- docs/skills/package-contract.md | 2 +- packages/utah.toml | 9 +++++++++ site/data/packages.json | 7 +++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 96130258d..b13af83e6 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ than being noticed later. | | count | | --- | --- | | Bluefin contract installed | **57** | -| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 60 | +| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 63 | | Genuinely unavailable | **10** | The install writes its resolved list to `/usr/share/utah/contract.txt` and the diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md index 8580cad66..56f0a24d6 100644 --- a/docs/skills/package-contract.md +++ b/docs/skills/package-contract.md @@ -165,7 +165,7 @@ default branch, preventing unrelated upstream changes from breaking Utah's CI. Update it whenever synchronizing `packages/bluefin.toml` with upstream. Current counts, per the README "Package parity" section: 57 Bluefin contract -packages installed, 60 Utah additions (GNOME 51, base-image parity, device +packages installed, 63 Utah additions (GNOME 51, base-image parity, device firmware, desktop services), 10 genuinely unavailable. `scripts/check-doc-counts.py` (part of `just check`) recomputes these from the manifests and fails if either document drifts from `site/data/packages.json`. diff --git a/packages/utah.toml b/packages/utah.toml index c5a3712f8..ae180bc63 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -148,6 +148,15 @@ packages = [ "acl", "attr", "buildah", + # Network filesystems: base-image parity measured from the published + # Bluefin image (baselines/GAP.md, #263). Bluefin inherits the full samba + # closure from Silverblue; samba, samba-winbind and samba-winbind-clients + # resolve today against the pinned utah-packages repository. cifs-utils, + # nfs-utils, rpcbind, autofs and davfs2 are not yet in any enabled + # repository and stay out until utah-packages builds them (#263). + "samba", + "samba-winbind", + "samba-winbind-clients", ] [hardware] diff --git a/site/data/packages.json b/site/data/packages.json index 4e99437d0..0e91a0dca 100644 --- a/site/data/packages.json +++ b/site/data/packages.json @@ -1,5 +1,5 @@ { - "generated_at": "2026-09-24", + "generated_at": "2026-09-25", "generator": "scripts/generate-site-data.py", "groups": [ { @@ -122,8 +122,11 @@ "pipewire-utils", "pulseaudio-utils", "python3-pip", + "samba", "samba-client", "samba-common-tools", + "samba-winbind", + "samba-winbind-clients", "systemd-container", "unzip", "which", @@ -174,7 +177,7 @@ } ], "totals": { - "installed": 117, + "installed": 120, "unavailable": 10 }, "unavailable": [ From a023badbbdccbf8a1f6b809005d28cfee8e70880 Mon Sep 17 00:00:00 2001 From: buggtb Date: Fri, 25 Sep 2026 18:54:08 +0000 Subject: [PATCH 2/2] fix(packages): drop samba-winbind/samba-winbind-clients until libvarlink ships Per review: contract failed in check-repos with nothing provides libvarlink.so.0()(64bit) needed by samba-winbind samba and samba-winbind-clients also fail to install without it. Drop both for now and keep only samba, which does resolve; track the winbind pair with the rest of #263 until utah-packages ships libvarlink. Regenerated site/data/packages.json with scripts/generate-site-data.py (118 installed, was hand-edited to a stale 120) and fixed the resulting count drift: README.md and docs/skills/package-contract.md now say 61 Utah additions (was 63), matching scripts/check-doc-counts.py. --- README.md | 2 +- docs/skills/package-contract.md | 2 +- packages/utah.toml | 13 +++++++------ site/data/packages.json | 4 +--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b13af83e6..a5e734fc3 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ than being noticed later. | | count | | --- | --- | | Bluefin contract installed | **57** | -| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 63 | +| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 61 | | Genuinely unavailable | **10** | The install writes its resolved list to `/usr/share/utah/contract.txt` and the diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md index 56f0a24d6..8ac0d0b3c 100644 --- a/docs/skills/package-contract.md +++ b/docs/skills/package-contract.md @@ -165,7 +165,7 @@ default branch, preventing unrelated upstream changes from breaking Utah's CI. Update it whenever synchronizing `packages/bluefin.toml` with upstream. Current counts, per the README "Package parity" section: 57 Bluefin contract -packages installed, 63 Utah additions (GNOME 51, base-image parity, device +packages installed, 61 Utah additions (GNOME 51, base-image parity, device firmware, desktop services), 10 genuinely unavailable. `scripts/check-doc-counts.py` (part of `just check`) recomputes these from the manifests and fails if either document drifts from `site/data/packages.json`. diff --git a/packages/utah.toml b/packages/utah.toml index ae180bc63..dd72306e6 100644 --- a/packages/utah.toml +++ b/packages/utah.toml @@ -150,13 +150,14 @@ packages = [ "buildah", # Network filesystems: base-image parity measured from the published # Bluefin image (baselines/GAP.md, #263). Bluefin inherits the full samba - # closure from Silverblue; samba, samba-winbind and samba-winbind-clients - # resolve today against the pinned utah-packages repository. cifs-utils, - # nfs-utils, rpcbind, autofs and davfs2 are not yet in any enabled - # repository and stay out until utah-packages builds them (#263). + # closure from Silverblue; samba resolves today against the pinned + # utah-packages repository. samba-winbind and samba-winbind-clients do + # not yet resolve: they require libvarlink, which utah-packages does not + # currently ship (`nothing provides libvarlink.so.0()(64bit)`). cifs-utils, + # nfs-utils, rpcbind, autofs and davfs2 are also not yet in any enabled + # repository. All of these stay out until utah-packages builds their + # missing dependencies (#263). "samba", - "samba-winbind", - "samba-winbind-clients", ] [hardware] diff --git a/site/data/packages.json b/site/data/packages.json index 0e91a0dca..54ea53297 100644 --- a/site/data/packages.json +++ b/site/data/packages.json @@ -125,8 +125,6 @@ "samba", "samba-client", "samba-common-tools", - "samba-winbind", - "samba-winbind-clients", "systemd-container", "unzip", "which", @@ -177,7 +175,7 @@ } ], "totals": { - "installed": 120, + "installed": 118, "unavailable": 10 }, "unavailable": [