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
11 changes: 10 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ RUN /usr/local/libexec/utah-install-v4l2loopback base /out
# - /out/branding/bluefin-logo-dark.svg is the source for the GDM greeter logo,
# which configure-branding.sh renders after the package transaction because
# nothing in this stage can rasterize an SVG.
# - img-logo-icon{,-dark,-text,-text-dark}.svg are the os-release LOGO icon
# and the variants Settings looks up beside it: the light and dark Bluefin
# wordmarks, as Dakota's common.bst installs them (#1266).
# Sources other than the wallpaper image are commit-pinned with sha256 in
# config/artwork.lock and verified by scripts/fetch-artwork.sh.
FROM ${BASE_IMAGE} AS artwork
Expand All @@ -67,7 +70,13 @@ RUN set -eu; \
/artwork/scripts/fetch-artwork.sh assets/vector/icons/logo-menu/logo-utahraptor-menu.svg \
/out/overlay/usr/share/icons/hicolor/scalable/actions/ublue-logo-symbolic.svg; \
/artwork/scripts/fetch-artwork.sh assets/vector/logos/bluefin/bluefin-logo-dark.svg \
/out/branding/bluefin-logo-dark.svg
/out/branding/bluefin-logo-dark.svg; \
pix=/out/overlay/usr/share/pixmaps; \
/artwork/scripts/fetch-artwork.sh assets/vector/logos/bluefin/bluefin-logo-light.svg \
"$pix/img-logo-icon.svg"; \
install -m0644 "$pix/img-logo-icon.svg" "$pix/img-logo-icon-text.svg"; \
install -m0644 /out/branding/bluefin-logo-dark.svg "$pix/img-logo-icon-dark.svg"; \
install -m0644 /out/branding/bluefin-logo-dark.svg "$pix/img-logo-icon-text-dark.svg"

# Stage source origins without committing their COPY mtimes to the runtime image.
FROM scratch AS inputs
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ Bluefin's `base.toml` and is now edited by hand as Dakota parity work lands.

| | count |
| --- | --- |
| Base manifest installed | **61** |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 281 |
| Base manifest installed | **60** |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 283 |
| Genuinely unavailable | **6** |

## Known gaps
Expand Down
10 changes: 5 additions & 5 deletions baselines/GAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Generated by `scripts/image-baseline.py gap`; do not edit.

| status | count |
| --- | ---: |
| planned | 50 |
| planned | 51 |
| unavailable | 1 |
| untriaged | 195 |
| untriaged | 194 |
| waived | 16 |

| item | status | what is missing | note |
Expand Down Expand Up @@ -62,7 +62,7 @@ Generated by `scripts/image-baseline.py gap`; do not edit.
| /usr/lib/systemd/system/dakota-secure-boot-update.service | planned | 1 system unit | (#1225) |
| /usr/lib/systemd/system/global-preset-all.service | planned | 1 system unit | GNOME OS first-boot preset-all; part of Dakota's enable-by-default service policy (#1233) |
| /usr/lib/systemd/system/ublue-boot-timeout.service | planned | 1 system unit | Runs bootctl set-timeout; only meaningful on systemd-boot (#1225) |
| /usr/lib/systemd/system/ublue-wallpaper-month.service | untriaged | 1 system unit | |
| /usr/lib/systemd/system/ublue-wallpaper-month.service | planned | 1 system unit | Ships in system_files with bluefin-wallpaper-month, as Dakota; the default wallpaper stays common's (#1266) |
| /usr/lib/systemd/user/cgroupify@.service | waived | 1 user unit | GNOME OS cgroup helper for its session |
| /usr/share/applications/emoji-picker.desktop | untriaged | 1 app | |
| /usr/share/applications/org.gnome.NautilusPreviewer.desktop | waived | 1 app | Flatpak-first: Utah ships org.gnome.NautilusPreviewer from Flathub (#1015) |
Expand Down Expand Up @@ -148,7 +148,7 @@ Generated by `scripts/image-baseline.py gap`; do not edit.
| itstool | untriaged | 1 command | |
| jpeg | untriaged | 6 commands | |
| json-glib | untriaged | 2 commands | |
| kanata | planned | 1 command, 1 system unit | Dakota remaps keys with kanata; Utah ships input-remapper (#1222) |
| kanata | planned | 1 command, 1 system unit | Installed from the factory in place of input-remapper; gap closes on the next baseline (#1222) |
| kmscon | waived | 2 commands, 2 system units | GNOME OS userspace console; Utah keeps the kernel VT console |
| krb5 | untriaged | 16 commands | |
| kyotocabinet | untriaged | 17 commands | |
Expand Down Expand Up @@ -277,5 +277,5 @@ Generated by `scripts/image-baseline.py gap`; do not edit.
| xmlto | untriaged | 2 commands | |
| xxhash | untriaged | 5 commands | |
| xz | untriaged | 12 commands | |
| ydotool | planned | 2 commands, 2 user units | (#1236) |
| ydotool | planned | 2 commands, 2 user units | Installed from the factory with kanata (#1222) |
| yelp | waived | 5 commands, 1 app | packages/base.toml [excluded] removes the yelp viewer; Utah keeps yelp-libs and yelp-xsl for help content |
6 changes: 3 additions & 3 deletions baselines/triage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# --- Structural differences, one epic child each ---------------------------

kanata = { status = "planned", area = "accessibility-input", issue = "#1222", reason = "Dakota remaps keys with kanata; Utah ships input-remapper" }
kanata = { status = "planned", area = "accessibility-input", issue = "#1222", reason = "Installed from the factory in place of input-remapper; gap closes on the next baseline" }
ghostty = { status = "planned", area = "desktop-apps", issue = "#1223", reason = "Dakota builds Ghostty natively; Utah installs the tuna-os Flatpak" }
"/usr/lib/systemd/system/dakota-secure-boot-update.service" = { status = "planned", area = "boot", issue = "#1225" }
"/usr/lib/systemd/system/ublue-boot-timeout.service" = { status = "planned", area = "boot", issue = "#1225", reason = "Runs bootctl set-timeout; only meaningful on systemd-boot" }
Expand Down Expand Up @@ -56,7 +56,7 @@ sysprof = { status = "planned", area = "desktop-apps", issue = "#1236" }
syncthing = { status = "planned", area = "desktop-apps", issue = "#1236", reason = "Utah enables the Syncthing toggle extension but ships no daemon" }
git-lfs = { status = "planned", area = "cli-tools", issue = "#1236" }
tealdeer = { status = "planned", area = "cli-tools", issue = "#1236" }
ydotool = { status = "planned", area = "accessibility-input", issue = "#1236" }
ydotool = { status = "planned", area = "accessibility-input", issue = "#1222", reason = "Installed from the factory with kanata" }
wget2 = { status = "planned", area = "cli-tools", issue = "#1236", reason = "Dakota's wget; Utah has no wget at all" }
nethogs = { status = "planned", area = "cli-tools", issue = "#1236" }
nicstat = { status = "planned", area = "cli-tools", issue = "#1236" }
Expand Down Expand Up @@ -132,7 +132,7 @@ bindfs = { status = "untriaged", area = "files-devices" }
"/usr/bin/substrings.pl" = { status = "untriaged", area = "dev-toolchain" }
"/usr/bin/sutf" = { status = "untriaged", area = "cli-tools" }
"/usr/bin/ublue-firstboot-date" = { status = "planned", area = "system-daemons", issue = "#1265", reason = "Ships with dakota-config-firstboot-date; records only once timesyncd replaces chrony (#1228)" }
"/usr/lib/systemd/system/ublue-wallpaper-month.service" = { status = "untriaged", area = "desktop-defaults" }
"/usr/lib/systemd/system/ublue-wallpaper-month.service" = { status = "planned", area = "desktop-defaults", issue = "#1266", reason = "Ships in system_files with bluefin-wallpaper-month, as Dakota; the default wallpaper stays common's" }
"/usr/lib/systemd/user/compass.service" = { status = "untriaged", area = "desktop-defaults" }
"/usr/bin/ucs2any" = { status = "untriaged", area = "fonts" }
"/usr/bin/vfat-resize" = { status = "untriaged", area = "files-devices" }
Expand Down
1 change: 1 addition & 0 deletions config/artwork.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
commit 72c74badbdd7c60d006e89aca74e248316dddd54
c3ce8a475deb9faa4efd7cb4bfab1dd5ef3b12cc48772a3ccf375c709c58711d assets/raster/dinos/jacob-schnurr/utah/utah-look/black-outline/utah-look-black-outline.png
4ae1d486e6e73743fad1e1ef625615c4a28e72bbcc0a966ba3c5294303e4e380 assets/vector/logos/bluefin/bluefin-logo-dark.svg
d336d743082bded58c561c2c53baf1896dae87d7346224d9d06512e6c247cf74 assets/vector/logos/bluefin/bluefin-logo-light.svg
be56a85e4fa93bbc2674a07b4b7d5a9eb8c95ca28eb6dea6cac66aeb9853492d assets/vector/icons/logo-menu/logo-utahraptor-menu.svg
42 changes: 29 additions & 13 deletions contracts/bluefin-desktop.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ files = [
"/usr/share/bluefin-artwork-logos/bluefin-logo-dark.png",
"/usr/share/icons/hicolor/scalable/actions/ublue-logo-symbolic.svg",
"/usr/share/icons/hicolor/icon-theme.cache",
# The os-release LOGO icon; common ships Bluefin's raptor under this name.
"/usr/share/pixmaps/fedora-logo-icon.png",
# The os-release LOGO icon and the names GNOME looks up beside it, Bluefin's
# artwork wordmarks as Dakota installs them (common.bst, #1266).
"/usr/share/pixmaps/img-logo-icon.svg",
"/usr/share/pixmaps/img-logo-icon-dark.svg",
"/usr/share/pixmaps/img-logo-icon-text.svg",
"/usr/share/pixmaps/img-logo-icon-text-dark.svg",
# The boot splash watermark the bgrt theme draws (Bluefin's raptor, from
# common); fedora-logos owns and erases this path during the logo swap.
"/usr/share/plymouth/themes/spinner/watermark.png",
Expand All @@ -38,8 +42,6 @@ files = [
"/usr/share/backgrounds/bluefin/01-bluefin.xml",
"/usr/share/backgrounds/bluefin/06-bluefin.xml",
"/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override",
"/usr/share/ublue-os/fastfetch-user-count",
"/usr/share/ublue-os/bazaar-install-count",
"/usr/bin/chairlift-helper",
"/usr/share/polkit-1/actions/io.projectbluefin.chairlift.ublue.policy",
]
Expand All @@ -57,7 +59,7 @@ VENDOR_URL = "https://projectbluefin.io"
DEFAULT_HOSTNAME = "bluefin"
VERSION_CODENAME = "Utahraptor"
IMAGE_ID = "utah"
LOGO = "fedora-logo-icon"
LOGO = "img-logo-icon"

[branding.os_release_patterns]
PRETTY_NAME = '^Bluefin \(Version: .+\)$'
Expand Down Expand Up @@ -135,22 +137,33 @@ files = [
# Dakota desktop parity (#675): first-boot install-date stamping and the
# booted-image snapshot for fastfetch, plus the one-shot removal of the live
# ISO's installer Flatpak, all from dakota-config-firstboot-date (#1265).
# Wallpaper rotation stays with Common's per-user timer (see
# configure-services.sh), so the Dakota month symlink units are
# intentionally not shipped.
"/usr/lib/systemd/system/ublue-firstboot-date.path",
"/usr/lib/systemd/system/ublue-firstboot-date.service",
"/usr/bin/ublue-firstboot-date",
"/usr/lib/systemd/system/ublue-booted-image.service",
"/usr/bin/ublue-booted-image-sync",
"/usr/lib/systemd/system/bluefin-remove-installer.service",
# Dakota's two monthly-wallpaper units (#1266); the default wallpaper stays
# common's (see configure-services.sh).
"/usr/lib/systemd/system/ublue-wallpaper-month.service",
"/usr/lib/systemd/system/bluefin-wallpaper-month.service",
"/usr/libexec/bluefin-wallpaper-month-sync",
# Common files configure-services.sh patches or checks for Dakota parity.
# file_contains skips missing files, so list them here to fail the build if
# Common drops one.
"/usr/share/ublue-os/fastfetch.jsonc",
"/usr/bin/ublue-image-info.sh",
"/usr/libexec/ublue-booted-image",
"/etc/profile.d/uwelcome.sh",
"/etc/skel/.config/ghostty/config.ghostty",
# Dakota's key remapper and its uinput helper (#1222): kanata's opt-in unit
# and preset, and ydotool's uinput udev rule and modules-load drop-in.
"/usr/bin/kanata",
"/usr/lib/systemd/system/kanata.service",
"/usr/lib/systemd/system-preset/80-kanata.preset",
"/usr/bin/ydotool",
"/usr/lib/udev/rules.d/80-ydotool.rules",
"/usr/lib/modules-load.d/ydotool.conf",
# Dakota's shell defaults (projectbluefin/dakota elements/bluefin/common.bst).
"/etc/profile.d/bluefin-shell-defaults.sh",
# Common's Red Hat signature policy uses the unsuffixed key path. The pinned
Expand Down Expand Up @@ -215,9 +228,10 @@ files = [
# by ublue-firstboot-date.service instead of inferring age from /var/log.
"/usr/share/ublue-os/fastfetch.jsonc" = [
"/var/lib/ublue-os/install-date",
# The community stats come from bluefin-stats-refresh.service's cache (#860).
"cat /var/cache/bluefin-stats/fastfetch-user-count 2>/dev/null || cat /usr/share/ublue-os/fastfetch-user-count",
"cat /var/cache/bluefin-stats/bazaar-install-count 2>/dev/null || cat /usr/share/ublue-os/bazaar-install-count",
]
# Dakota's patches/common/0002-ghostty-dual-theme.patch (#1266).
"/etc/skel/.config/ghostty/config.ghostty" = [
"theme = light:Catppuccin Latte,dark:Catppuccin Mocha",
]
# Dakota parity (#675): ublue-image-info.sh reads the booted tag through
# Common's ublue-booted-image reader, which falls back to the boot-time
Expand Down Expand Up @@ -456,7 +470,8 @@ enabled = [
"bootc-unified-storage.timer",
"brew-setup.service",
"cups.socket",
"bluefin-stats-refresh.timer",
"ublue-wallpaper-month.service",
"bluefin-wallpaper-month.service",
"dconf-update.service",
"flatpak-nuke-fedora.service",
"flatpak-preinstall.service",
Expand All @@ -466,7 +481,6 @@ enabled = [
# without an [Install] section, so it is D-Bus activated and `systemctl
# enable` is a no-op (the nvidia/gaming image builds failed on it).
"accounts-daemon.service",
"input-remapper.service",
"ModemManager.service",
"power-profiles-daemon.service",
# Dakota's effective service state (#1233); see 85-utah-desktop.preset.
Expand Down Expand Up @@ -558,6 +572,8 @@ disabled = [
"sysstat-collect.timer",
"sysstat-summary.timer",
"sysstat-rotate.timer",
# Key remapping is opt-in, as on Dakota (#1222).
"kanata.service",
# Utah-only units Dakota does not run (#1233).
"multipathd.service",
"lm_sensors.service",
Expand Down
30 changes: 13 additions & 17 deletions docs/skills/desktop-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,21 @@ The TOML's sections are the contract's table of contents:
- **`[services]`** — systemd units the preset must enable: `gdm.service`, `accounts-daemon.service`,
`avahi-daemon.service`, `avahi-daemon.socket`, `bluetooth.service`, `switcheroo-control.service`,
`ublue-system-setup.service`, `flatpak-preinstall.service`, `flatpak-nuke-fedora.service`,
`brew-setup.service`, `dconf-update.service`, `bootc-unified-storage.timer`, `input-remapper.service`,
`brew-setup.service`, `dconf-update.service`, `bootc-unified-storage.timer`,
`ModemManager.service`, `power-profiles-daemon.service`, `thermald.service`, `projectbluefin-countme.timer`,
`cups.socket`, `systemd-boot-update.service`, `uupd.timer`, `bluefin-stats-refresh.timer`, `ublue-firstboot-date.path`,
`cups.socket`, `systemd-boot-update.service`, `uupd.timer`, `ublue-wallpaper-month.service`, `bluefin-wallpaper-month.service`, `ublue-firstboot-date.path`,
`ublue-booted-image.service`, `bluefin-remove-installer.service`. [Dakota service presets](desktop-contract/references/dakota-services.md): GNOME units, user units, opt-in sysstat.
Update policy delegates background updates to `uupd.timer`; `bootc-fetch-apply-updates.timer` and
`bootc-fetch-apply-updates.service` are masked in `/etc` and `/usr/lib` (and disabled in
`85-utah-desktop.preset`) so cross-vendor `/etc` 3-way merges (e.g. switching from Bluefin) do not
carry active `timers.target.wants` symlinks that bypass uupd staging or undo manual rollbacks.
Switchers can mask them by hand if a local `/etc` symlink survived. uupd matches Dakota ([uupd](desktop-contract/references/uupd.md)).

The last two units are Dakota parity (#675): install-date stamping and the
booted-image snapshot Common's `/usr/libexec/ublue-booted-image` falls back to.
`configure-services.sh` enables them, patches Common's fastfetch ([stats](desktop-contract/references/stats-refresh.md))
and `uwelcome.sh` (non-interactive shells skip the greeting), checks image-info ([bootc compatibility](desktop-contract/references/image-info.md)), and applies [Dakota's desktop defaults](desktop-contract/references/dakota-desktop-defaults.md).
Wallpaper rotation is deliberately NOT Dakota parity: Common's per-user `bluefin-dynamic-wallpaper`
timer is hemisphere-aware and rotates live at month boundaries, while
Dakota's boot-time month symlink is northern-only and stale until reboot, so
repointing the default would stand the better rotator down (#675 decision).
The firstboot-date, booted-image and remove-installer units are Dakota parity (#675): install-date
stamping and the booted-image snapshot Common's `/usr/libexec/ublue-booted-image` falls back to.
`configure-services.sh` enables them, applies [Dakota's edits to Common](desktop-contract/references/dakota-common-edits.md)
(month units, weekly stats, Ghostty theme, logos; #1266),
patches `uwelcome.sh` (non-interactive shells skip the greeting), checks image-info ([bootc compatibility](desktop-contract/references/image-info.md)), and applies [Dakota's desktop defaults](desktop-contract/references/dakota-desktop-defaults.md).

A unit being enabled in the built image is not the same as it being enabled
on a booted one. bootc applies presets on first boot, and Hummingbird's
Expand Down Expand Up @@ -320,12 +317,11 @@ a `path=` the extensions ship; it skips when the submodules are not checked out.

GNOME Initial Setup's welcome page shows the icon named by os-release
`LOGO`. Distributor builds of Settings > About use the compiled PNG paths
described below. Fedora sets `LOGO=fedora-logo-icon` and
Bluefin keeps it; common overlays the raptor at
`/usr/share/pixmaps/fedora-logo-icon.png`. Hummingbird's os-release has no
`LOGO`, so Utah showed the generic GNOME foot with the raptor already on disk.
`configure-branding.sh` sets it, and the contract asserts both the key and the
icon file. To check without a build: `bootc usr-overlay`, append the key to
described below. Hummingbird's os-release has no `LOGO`, so Utah showed the
generic GNOME foot. `configure-branding.sh` sets `LOGO=img-logo-icon` as
Dakota does, and the `artwork` stage installs Dakota's four
`/usr/share/pixmaps/img-logo-icon*.svg` wordmarks (#1266); the contract asserts
the key and the files. To check without a build: `bootc usr-overlay`, append the key to
`/usr/lib/os-release`, `systemctl restart gdm`, and look at Initial Setup.

## The GDM greeter logo is Bluefin, not Fedora (#378)
Expand Down Expand Up @@ -389,7 +385,7 @@ build.
Hummingbird defaults to a server preset and disables unlisted services, so
the desktop policy is applied explicitly. `scripts/configure-services.sh`
mirrors bluefin-lts's `40-services.sh`: it applies the desktop presets,
enables GDM, input-remapper, firmware updates, Tailscale, uupd, user setup and resolved,
enables GDM, firmware updates, Tailscale, uupd, user setup and resolved, keeps kanata opt-in,
configures authselect, and removes the extension build toolchain before
cleanup. Lid/sleep stay at logind defaults; Dakota-copied sysctl, WirePlumber
and polkit defaults: [Dakota system defaults](desktop-contract/references/dakota-system-defaults.md).
Expand Down
8 changes: 6 additions & 2 deletions docs/skills/desktop-contract/references/about-artwork.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ Wallpapers: `/usr/share/backgrounds/bluefin/*` and
`bluefin-wallpapers-gnome` image, overlaid after Common's copy (see the
Containerfile skill). `01-bluefin.xml` and `06-bluefin.xml` are contract files.
The mascot the live installer shows is the Utah black-outline art, staged into
`iso/live/src/images/utahraptor.png` by the ISO builders; the os-release `LOGO`
raptor (`fedora-logo-icon.png`) remains Common's.
`iso/live/src/images/utahraptor.png` by the ISO builders. The os-release `LOGO`
is `img-logo-icon`, as on Dakota: artwork's `bluefin-logo-light.svg` installed
as `/usr/share/pixmaps/img-logo-icon.svg` and `img-logo-icon-text.svg`, and
`bluefin-logo-dark.svg` as the two `-dark` names, all from the
`config/artwork.lock` commit (the bytes match Dakota's pins at artwork
`de74de65`; #1266).

## GDM greeter logo

Expand Down
Loading
Loading