Skip to content
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Bluefin's `base.toml` and is now edited by hand as Dakota parity work lands.
| | count |
| --- | --- |
| Base manifest installed | **57** |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 339 |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 343 |
| Genuinely unavailable | **9** |

## Known gaps
Expand Down
2 changes: 1 addition & 1 deletion docs/skills/package-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ describe the same image as its `surface.tsv`; after a refresh,
[remove resolved triage entries](package-contract/references/factory-consumption.md#closing-baseline-gaps).

Current counts, per the README "Parity with Dakota" section: 57 base manifest
packages installed, 339 Utah additions (GNOME 51, base-image parity, device
packages installed, 343 Utah additions (GNOME 51, base-image parity, device
firmware, desktop services), 9 genuinely unavailable. After changing a manifest,
run `python3 scripts/generate-site-data.py`, then
`python3 scripts/check-doc-counts.py --write` to refresh both documents.
Expand Down
13 changes: 13 additions & 0 deletions packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,14 @@ packages = [
"bindfs",
"malcontent-tools",
"nfs-python-utils",
# DLNA/UPnP media sharing (GNOME Settings > Sharing > Media Sharing), as
# Dakota ships it (#1258). The rygel package carries /etc/rygel.conf and
# the rygel.service user unit Settings starts; gupnp-av's factory recipe
# was added in utah-packages#1147.
"rygel",
"gupnp-av",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correctness (still present): gupnp-av is not in the pinned package image yet. CI contract on head c997c286 fails check-repos: No match for argument: gupnp-av and nothing provides libgupnp-av-1.0.so.3()(64bit) needed by rygel-46.1-1.hum1.bfin.x86_64. rygel hard-requires it, so dropping this line does not help.

Fix: bump PACKAGE_IMAGE_SHA in Containerfile:6 to a utah-packages image digest built after utah-packages#1022 (or rebase once Renovate lands that bump on main), then re-run just check-repos:

-ARG PACKAGE_IMAGE_SHA=sha256:0b0664cb8591ccf8f2b42e7bcb1cb0f27d5da91eaf450dfa64c7982730be38c1
+ARG PACKAGE_IMAGE_SHA=sha256:<digest of package image that ships gupnp-av>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The branch now includes main’s newer factory pin, sha256:744c4632, which is also the registry latest. The current contract run still fails: gupnp-av is absent and rygel cannot resolve libgupnp-av-1.0.so.3. A factory publication containing that RPM is still needed before the pin can be updated and contract can pass: https://github.com/projectbluefin/utah/actions/runs/44229337338/job/134550234432

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correctness (still present): gupnp-av is still missing from the pinned package image 744c4632. The contract job ran on this head (job 134552642637), and check-repos fails with No match for argument: gupnp-av and nothing provides libgupnp-av-1.0.so.3()(64bit) needed by rygel-46.1-1.hum1.bfin.x86_64. The recipe merged in utah-packages#1147, but no published image includes it yet. Once one does, update ARG PACKAGE_IMAGE_SHA in Containerfile and the # factory-pin: line in packages/utah-packages.repo to that digest together.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correctness (still present from previous review): gupnp-av isn't in the factory repository pinned at Containerfile:6 (sha256:744c4632…). On this head, contract → check-repos fails with No match for argument: gupnp-av and nothing provides libgupnp-av-1.0.so.3()(64bit) needed by rygel-46.1-1.hum1.bfin.x86_64. As a result, rygel can't install either.

Fix: bump PACKAGE_IMAGE_SHA in Containerfile:6 to a ghcr.io/projectbluefin/utah-packages digest built after utah-packages#1147 (the change that added the gupnp-av recipe), together with the matching # factory-pin: stamp in packages/utah-packages.repo. You can also rebase onto the routine pin-bump PR once it lands. Then re-run just check-repos.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correctness (still present from last review): gupnp-av cannot be resolved from the pinned package image. Containerfile:6 PACKAGE_IMAGE_SHA=sha256:744c4632… is unchanged since 8d73bf6, and the PR body confirms that the image lacks this RPM. Bump PACKAGE_IMAGE_SHA to a utah-packages publish that contains gupnp-av, then re-run contract. It failed at this head on a codeberg.org DNS error before check-repos ran.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still present at 1ca04c61: gupnp-av is not in the pinned package image. In the contract job at this head (job 135082071265), the just check-repos step fails with:

No match for argument: gupnp-av
  - nothing provides libgupnp-av-1.0.so.3()(64bit) needed by rygel-46.1-1.hum1.bfin.x86_64 from utah-packages

That means rygel cannot be installed either, so the image build would fail. Neither the PR nor the merged main moves the package pin to an image that carries the utah-packages#1147 build.

Fix: The fix does not belong in this diff. When the factory publishes an image that contains gupnp-av, bump the package-image pin (on main or here), merge main into this branch again, and confirm check-repos passes. Do not drop gupnp-av from the list: rygel needs its library.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rechecked the registry: utah-packages:latest still resolves to the exact pinned digest (sha256:744c4632…). The current contract failure therefore still needs a factory publication containing gupnp-av; I left the pin unchanged.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rechecked the factory registry and both pin locations: latest still equals sha256:744c4632cca27c059905779911b4db3269ff069825372c1ba6c8fbf6668ed3d0, the digest already shown by contract to lack gupnp-av. No pin change or repeat check-repos on the same image. This still needs a factory image containing gupnp-av before contract can validate it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged current main in dcadd32 and verified the generated inventory and counts. The factory registry’s latest still matches the existing pin, sha256:744c4632…, which contract already showed lacks gupnp-av. I left both pins and all four packages unchanged; check-repos needs a factory image containing the missing RPM.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[correctness] Image can't build yet: gupnp-av is missing from the pinned package image. The factory recipe landed (utah-packages#1147), but Utah still builds from utah-packages@sha256:744c4632… (Containerfile:6, and packages/utah-packages.repo:4 stamps the same digest). That publish has no gupnp-av RPM. So just check-repos (Justfile:204, run by build.yml:124) fails, and the image build can't install rygel. rygel links against libgupnp-av, so dropping this one line would not help.

Fix: once a factory publish contains gupnp-av, bump both pins to that digest in this PR. Use the factory-pin rev tool (#337/#367), or take the Renovate digest bump and merge main:

--- a/Containerfile
+++ b/Containerfile
-ARG PACKAGE_IMAGE_SHA=sha256:744c4632cca27c059905779911b4db3269ff069825372c1ba6c8fbf6668ed3d0
+ARG PACKAGE_IMAGE_SHA=sha256:<digest of the publish carrying gupnp-av>
--- a/packages/utah-packages.repo
+++ b/packages/utah-packages.repo
-# factory-pin: sha256:744c4632cca27c059905779911b4db3269ff069825372c1ba6c8fbf6668ed3d0
+# factory-pin: sha256:<same digest>

Then re-run just check-repos and confirm it passes.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new factory publish sha256:acfed6fc6c24247de0de9c6624cb3a87f9e24e411671f5521d93f498853cb5bf contains all four media-sharing RPMs. Its repository metadata confirms that gupnp-av provides the exact libgupnp-av-1.0.so.3()(64bit) required by Rygel. I tried both pins in an isolated copy: just check-repos got past the missing Rygel dependency but failed on a different dependency, ptyxis → vte291-gtk4 → missing libsimdutf.so.34()(64bit). I left the branch pins unchanged per the maintainer’s direction to take the validated factory bump from main.

"gupnp-dlna",
"gst-editing-services",
#
# Left out (resolved against sha256:d3b5bac2):
# tuned, tuned-ppd Dakota runs power-profiles-daemon, which is
Expand Down Expand Up @@ -1163,4 +1171,9 @@ parity = [
"nfs-python-utils",
"google-noto-serif-cjk-vf-fonts",
"nerd-fonts-symbols",
# DLNA/UPnP media sharing (#1258).
"rygel",
"gupnp-av",
"gupnp-dlna",
"gst-editing-services",
]
6 changes: 5 additions & 1 deletion site/data/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
"google-noto-serif-cjk-vf-fonts",
"google-noto-serif-vf-fonts",
"gssproxy",
"gst-editing-services",
"gst-thumbnailers",
"gstreamer1-plugin-dav1d",
"gstreamer1-plugin-libav",
Expand All @@ -224,6 +225,8 @@
"gstreamer1-plugins-bad-free-libs",
"gstreamer1-plugins-base-tools",
"gstreamer1-plugins-ugly-free",
"gupnp-av",
"gupnp-dlna",
"gutenprint",
"gutenprint-cups",
"gutenprint-libs",
Expand Down Expand Up @@ -342,6 +345,7 @@
"rc-tools",
"rpcbind",
"rsync",
"rygel",
"samba",
"samba-client",
"samba-common-tools",
Expand Down Expand Up @@ -453,7 +457,7 @@
}
],
"totals": {
"installed": 396,
"installed": 400,
"unavailable": 9
},
"unavailable": [
Expand Down
Loading