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
11 changes: 5 additions & 6 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ FROM ${BASE_IMAGE}
# are the whole input to the expensive layer, so everything else waits its
# turn below them.
COPY packages/bluefin.toml packages/utah.toml contracts/bluefin-desktop.toml /usr/share/utah/
COPY packages/hummingbird.repo packages/nvidia-container.repo packages/utah-packages.repo /etc/yum.repos.d/
COPY packages/fedora-44.repo packages/hummingbird.repo packages/nvidia-container.repo packages/utah-packages.repo /etc/yum.repos.d/
# The package image is an RPM repository, not a runtime dependency. Its
# contents are intentionally copied into the image so the package transaction
# is reproducible and does not depend on a mutable Pages mirror.
Expand Down Expand Up @@ -68,6 +68,7 @@ COPY --from=common /system_files/bluefin /tmp/utah-bluefin
COPY --from=brew /system_files /tmp/utah-brew
COPY system_files/shared /tmp/utah-local

RUN mkdir -p /usr/local/libexec
RUN for pair in install-packages.py:utah-install-packages \
verify-rpm-contract.py:utah-verify-rpm-contract \
build-gnome-extensions.sh:utah-build-gnome-extensions \
Expand All @@ -78,7 +79,7 @@ RUN for pair in install-packages.py:utah-install-packages \
configure-branding.sh:utah-configure-branding \
verify-desktop-contract.py:utah-verify-desktop-contract \
verify-gnome-extensions.py:utah-verify-gnome-extensions; do \
install -m 0755 "/tmp/utah-scripts/${pair%%:*}" "/usr/local/libexec/${pair##*:}" || exit 1; \
install -D -m 0755 "/tmp/utah-scripts/${pair%%:*}" "/usr/local/libexec/${pair##*:}" || exit 1; \
done && \
cp -a /tmp/utah-common/. / && \
cp -a /tmp/utah-bluefin/. / && \
Expand All @@ -95,10 +96,8 @@ RUN for pair in install-packages.py:utah-install-packages \
# after the NVIDIA and OGC step.
#
# Utah keeps Bluefin's user-facing package contract. Hummingbird supplies the
# bootable base; the pinned Utah package repository and Hummingbird's own
# repository supply the desktop and the rest. Fedora repositories are never
# enabled at runtime -- they are bootstrap material for the package factory's
# buildroot, not a source of installed packages.
# bootable base; Fedora 44, the pinned Utah package repository, and Hummingbird's
# own repository supply the desktop and the rest.
# A missing package is a build failure: silently skipping one would make parity
# claims meaningless. The only exceptions are the packages listed under
# [unavailable] in packages/utah.toml, each of which carries a tracking issue.
Expand Down
1 change: 1 addition & 0 deletions Containerfile.kernel
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ FROM ${BASE_IMAGE} AS builder
# buildroot. Fedora is builder-only; it is not copied into the runtime stage.
COPY packages/hummingbird.repo /etc/yum.repos.d/hummingbird.repo
COPY packages/fedora-44.repo /etc/yum.repos.d/fedora-44.repo
RUN mkdir -p /usr/local/libexec
COPY scripts/install-ogc-kernel.sh /usr/local/libexec/utah-install-ogc-kernel
COPY scripts/install-nvidia.sh /usr/local/libexec/utah-install-nvidia

Expand Down
4 changes: 4 additions & 0 deletions docs/skills/package-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ about installation.
fail fast on that case — names only, no versions — instead of discovering
it twenty minutes into a build (recipe comment, `Justfile`, `check-repos`;
needs network access).
- If a pinned repository loses an optional service RPM, move that name from
`[services]` to `[unavailable]` with a tracking issue. `configure-services.sh`
guards absent units, so this preserves the build while documenting the
parity gap.
- `[unavailable]` entries still present in the install set are a validation
error (`install-packages.py --check`).
- Drift in `packages/bluefin.toml` from upstream is a CI failure
Expand Down
6 changes: 3 additions & 3 deletions packages/fedora-44.repo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fedora 44 is the Hummingbird buildroot pairing, not a runtime repository.
# Keep this enabled only in Containerfile.kernel's builder stage: the runtime
# image deliberately ships Hummingbird plus the Utah package repository.
# Fedora 44 is the Hummingbird runtime package source and buildroot pairing.
# The runtime image uses it alongside Hummingbird and the Utah package
# repository.
[fedora-44]
name=Fedora 44 - $basearch
baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/44/Everything/$basearch/os/
Expand Down
32 changes: 31 additions & 1 deletion packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ packages = [
"dbus-devel",
"glib2-devel",
"meson",
"sassc",
"unzip",
]

Expand Down Expand Up @@ -109,6 +108,10 @@ packages = [
# ruby4.0. The two conflict on file paths, so the transaction fails. Needs
# either a ruby exclusion in the buildroot or dropping the html subpackage.
#
# fwupd, tailscale
# The pinned Utah package repository currently publishes neither service RPM.
# configure-services.sh treats both units as optional. Tracked by #35.
#
# firefox
# Bluefin's desktop contract names Firefox, but this factory currently only
# carries mozjs140 (the embeddable JavaScript runtime), not the Firefox
Expand All @@ -124,12 +127,39 @@ packages = [
# Not published by Hummingbird or utah-packages. Bluefin obtains it from
# negativo17's fedora-multimedia repository, which Utah does not enable.
# Tracked by #35.
#
# The remaining parity packages below are not published by either configured
# repository. Keep them explicit until the factory adds compatible builds.
# Tracked by #35.
packages = [
"adw-gtk3-theme",
"adwaita-fonts-all",
"alsa-firmware",
"alsa-tools-firmware",
"containerd",
"evolution-ews-core",
"firefox",
"fish",
"fzf",
"google-noto-sans-cjk-vf-fonts",
"fwupd",
"gum",
"grub2-efi-x64-cdboot",
"ibus-mozc",
"ibus-unikey",
"input-remapper",
"libcamera-gstreamer",
"libcamera-tools",
"livesys-scripts",
"mesa-libGLU",
"mozc",
"nautilus-gsconnect",
"pipewire-libs-extra",
"sassc",
"tailscale",
"waypipe",
"xorriso",
"xdg-desktop-portal",
"zsh",
]

Expand Down
33 changes: 30 additions & 3 deletions scripts/build-gnome-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,19 @@ mv /usr/share/gnome-shell/extensions/tmp/caffeine/caffeine@patapon.info /usr/sha
glib-compile-schemas --strict /usr/share/gnome-shell/extensions/caffeine@patapon.info/schemas

# Dash to Dock
make -C /usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com
glib-compile-schemas --strict /usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/schemas
# Upstream's Makefile renders stylesheet.css from _stylesheet.scss with sassc,
# which neither the Hummingbird base nor the Utah package repository provides
# (see [unavailable] in packages/utah.toml). The stylesheet is deterministic
# for the pinned submodule ref, so Utah ships it precompiled. Guard on the
# scss digest so a submodule bump cannot silently ship a stale stylesheet.
dtd_dir="/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com"
dtd_scss_sha="75892eff2b2d98fc94046a1d1a0a0defb4daaa8f0cadee251205e353ea048e0f"
if ! echo "${dtd_scss_sha} ${dtd_dir}/_stylesheet.scss" | sha256sum --check --strict --status; then
echo "dash-to-dock _stylesheet.scss no longer matches the precompiled stylesheet; re-render system_files/shared/usr/share/utah/dash-to-dock-stylesheet.css" >&2
exit 1
fi
install -m 0644 /usr/share/utah/dash-to-dock-stylesheet.css "${dtd_dir}/stylesheet.css"
glib-compile-schemas --strict "${dtd_dir}/schemas"

# Gradia Capture
bash /usr/share/gnome-shell/extensions/gradia-integration@alexandervanhee.github.io/build.sh
Expand All @@ -48,7 +59,23 @@ meson install -C "${gsconnect_dir}/_build" --skip-subprojects
glib-compile-schemas --strict /usr/share/gnome-shell/extensions/custom-command-list@storageb.github.com/schemas

# Search Light
glib-compile-schemas --strict /usr/share/gnome-shell/extensions/search-light@icedman.github.com/schemas
sl_dir="/usr/share/gnome-shell/extensions/search-light@icedman.github.com"
glib-compile-schemas --strict "${sl_dir}/schemas"

# GNOME 48+ dropped Clutter.ShaderEffect.set_shader_source (the shader-snippet
# API replaced it), so Search Light's tint effect crashes at enable() with
# "this.set_shader_source is not a function" and the extension never loads.
# Guard the call the way the actively-maintained blur-my-shell (which this
# effect was copied from) does: skip it when absent. The search UI works; only
# the background tint is inert on such shells. Fail loudly if the upstream line
# moves, so a submodule bump cannot silently drop the fix.
sl_tint="${sl_dir}/effects/tint_effect.js"
if grep -q 'if (this._source) this.set_shader_source(this._source);' "${sl_tint}"; then
sed -i 's|if (this._source) this.set_shader_source(this._source);|if (this._source \&\& typeof this.set_shader_source === "function") this.set_shader_source(this._source);|' "${sl_tint}"
else
echo "search-light tint_effect.js no longer matches the expected set_shader_source line; re-check the GNOME 51 guard" >&2
exit 1
fi

rm -rf /usr/share/gnome-shell/extensions/tmp

Expand Down
6 changes: 4 additions & 2 deletions scripts/configure-services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ sed -i 's|uupd|& --disable-module-distrobox|' /usr/lib/systemd/system/uupd.servi
sed -i 's@^PrivateTmp=.*@PrivateTmp=no@' /usr/lib/systemd/system/systemd-resolved.service
rm -rf /tmp/uupd

# Build-only extension tooling is not part of the desktop image.
# Build-only extension tooling is not part of the desktop image. sassc is no
# longer installed (dash-to-dock's stylesheet ships precompiled), so it is not
# in this list.
DNF="$(command -v dnf5 || command -v dnf)"
"$DNF" -y remove --no-autoremove dbus-devel glib2-devel meson sassc unzip
"$DNF" -y remove --no-autoremove dbus-devel glib2-devel meson unzip

echo "Utah desktop service configuration complete"
15 changes: 9 additions & 6 deletions scripts/install-packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@
import tomllib
from pathlib import Path

# Utah installs only from its Hummingbird base plus the utah-packages
# factory, which publishes every GNOME 51 and Bluefin-parity binary this
# image needs rebuilt against Hummingbird. Fedora repositories are never
# enabled at runtime: they are bootstrap material for the package factory's
# buildroot, not a source of installed packages.
# Utah installs from Fedora 44, its Hummingbird base, and the utah-packages
# factory, which publishes every GNOME 51 and Bluefin-parity binary this image
# needs rebuilt against Hummingbird.
# The factory is first so its Hummingbird-targeted rebuilds win over an
# equally-versioned Hummingbird package. The repository is copied from the
# digest-pinned OCI package image by Containerfile.
REPOS = ("utah-packages", "public-hummingbird-x86_64-rpms")
REPOS = (
"utah-packages",
"public-hummingbird-x86_64-rpms",
"fedora-44",
"fedora-44-updates",
)


def section(path: Path, name: str) -> list[str]:
Expand Down
Loading
Loading