Repository navigation
Conversation
Dakota ships freedesktop-sdk's git-lfs, whose integration command appends a [filter "lfs"] stanza to /etc/gitconfig. Hummingbird's git-lfs writes the same four keys from its %post (git lfs install --system), so Utah installs the package and asserts the stanza in the desktop contract instead of overlaying a copy. Closes #1259 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danathar, hanthor The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Withdrawn: this PR is not back in your court after all. The failing checks ( |
Danathar
left a comment
There was a problem hiding this comment.
Stand-in review (the hive's reviewers are out of quota). Approving. It installs git-lfs, and the contract checks the system [filter "lfs"] stanza in /etc/gitconfig. I checked that Fedora's git-lfs.spec %post runs git-lfs install --system --skip-repo (unless fedora.git-lfs.no-modify-config is set), so the image build writes that stanza, matching Dakota's freedesktop-sdk element. The red contract comes from the stack below (power-profiles-daemon, gnome-os-config-*), not this change.
|
More verification: I ran |
|
Folded into the part-2 landing PR (fold/dakota-sq) with this change unchanged apart from rebase and conflict resolution. Closing here; review continues there. |
…1278…#1289) (#1309) * feat(services): enable units by default, as GNOME OS and Dakota do Hummingbird's 99-default-disable.preset turns off every unit no preset names; GNOME OS has no catch-all disable, so a booted Dakota runs what it installs. 98-utah-enable-default.preset outranks Hummingbird's catch-all with GNOME OS's and Dakota's explicit disables, the Utah-only units that must stay off, then `enable *`. 85-utah-desktop.preset shrinks to the units Hummingbird's own 80/90 presets decide differently. configure-services.sh drops its per-unit enable list and runs `systemctl preset-all`, so the image carries the first-boot state and the desktop contract checks it. Tests resolve every contract unit against the preset files the way systemd does. Closes #1233 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(time): systemd-timesyncd instead of chrony, as on Dakota GNOME OS and Dakota sync time with systemd-timesyncd. Utah drops Hummingbird's chrony (base.toml [excluded]) and the chrony.conf pool fallback, enables timesyncd over Hummingbird's 90-default disable, and ships GNOME OS's fallback server as a timesyncd.conf.d drop-in (gnome-build-meta core-deps/systemd-base.bst fallback-ntp-servers: gnome.pool.ntp.org). Hummingbird's compiled-in pool does not resolve publicly (#594). The install-date stamp now uses Dakota's files/firstboot units: the .path waits for /run/systemd/timesync/synchronized, so the date written is a synced one. Closes #1228 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(packages): ship fish and drop zsh, as Dakota does Dakota ships fish from GNOME OS and no zsh. fish leaves [unavailable] (the factory builds it; it was a deliberate exclusion, #419) so base.toml's entry installs, and zsh leaves the base manifest. Common's /etc/zsh files stay, unused, exactly as on Dakota. The repo gate keeps its deliberate-exclusion mechanism with an empty set; its tests use a stand-in. Closes #1230 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(swap): zswap over /var/swap/swapfile instead of zram, as on Dakota Copy Dakota's elements/bluefin/zswap-config.bst (20-zswap.toml kargs, 60-zswap.conf sysctls) and swapfile.bst (bluefin-swapfile-init, its oneshot unit, var-swap-swapfile.swap and the static swap.target.wants link), and drop zram-generator(-defaults). Two Utah-only pieces Dakota does not need: - Hummingbird's kernel builds zstd as a module (CONFIG_CRYPTO_ZSTD=m) and zswap resolves zswap.compressor=zstd during kernel init, so a dracut drop-in adds zstd to the initramfs and regenerate-initramfs.sh fails the build if a modular zstd is missing from it. - Utah keeps SELinux: a one-line CIL module labels /var/swap/swapfile swapfile_t (installed into the /usr/lib/selinux store at build time and checked with matchpathcon), and the init script restorecons the file before writing it. Closes #1224 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(home): bind-mount /var/home over /home, as on Dakota /home becomes an empty directory in the image and Dakota's home.mount (files/bindmounts/home.mount) binds /var/home over it, so /home/<user> is the real path rather than a symlink into /var. Dakota's bluefin-migrate-var-home-passwd rewrites legacy /var/home/<user> passwd fields; Utah's copy fixes the fast-path regex that kept Dakota's from ever matching a user entry (projectbluefin/dakota#1491). The build fails if anything lands in the image's /home, home.mount skips when /var/home is missing, and the live ISO writes liveuser's files under /var/home and points its passwd field at /home/liveuser. Closes #1234 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(virtualization): QEMU, toolbox and guest agents as on Dakota; drop containerd Install qemu-kvm, qemu-guest-agent, spice-vdagent, open-vm-tools, hyperv-daemons and toolbox (systemd-container was already in), all published by the factory. libvirt and virtiofsd are pending factory imports (utah-packages#1021, #1147) and go in [unavailable] so check-repos flags them once published. Dakota's presets are already carried: 80-libvirt.preset's disables live in 98-utah-enable-default.preset and its guest-agent enables follow from enable-by-default; the contract now asserts vmtoolsd and qemu-guest-agent enabled and libvirt's sockets off. `ujust setup-virtualization` and `manage-virtualization` run Dakota's files/just-overrides/devmode.py, shipped verbatim as /usr/libexec/dakota-devmode, and explain the missing libvirt until it lands. containerd and runc are excluded; podman runs on crun. Closes #1232 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(ujust): ship Dakota's default.just and system.just Replace Common's default.just, system.just and flutter.just with Dakota's (files/just-overrides at bf271777), plus the two Brewfiles system.just reads. Issue links and rebase-helper target Utah; recipes that drive Dakota's signed systemd-boot chain point at #1225, and toggle-network-monitoring explains the missing nethogs mount. Utah's enroll-secure-boot-key override is dropped in favour of the vendored stub. The ujust test harness now loads the shipped files instead of a mock default.just, and covers the stubs and the Utah issue links. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(auth): homed-aware PAM and systemd-homed-firstboot, as on Dakota Enable authselect's with-systemd-homed so pam_systemd_home is in system-auth and password-auth, as in freedesktop-sdk's PAM stack on Dakota. Drop systemd-homed-firstboot from the enable-by-default disables so it runs on first boot. A drop-in sets SYSTEMD_HOME_FIRSTBOOT_OVERRIDE=0: homectl firstboot still applies home.create.*/home.register.* credentials, but does not prompt on the console for a first user ahead of gnome-initial-setup, which owns account creation. The contract asserts the feature, the PAM and nsswitch lines, the drop-in and both units. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(packages): install git-lfs with the system LFS filter, as on Dakota Dakota ships freedesktop-sdk's git-lfs, whose integration command appends a [filter "lfs"] stanza to /etc/gitconfig. Hummingbird's git-lfs writes the same four keys from its %post (git lfs install --system), so Utah installs the package and asserts the stanza in the desktop contract instead of overlaying a copy. Closes #1259 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(packages): install ifuse for iOS file access, as on Dakota Dakota ships ifuse (elements/bluefin/ifuse.bst, 1.2.1). The factory builds the same version, so request it in [parity] and assert its factory release in [factory].parity. Closes #1261 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(packages): install opensc with GNOME OS's opensc.module, as on Dakota Dakota ships opensc 0.27.1 (freedesktop-sdk-extra components/opensc.bst) and GNOME OS's files/opensc/opensc.module, whose disable-in list keeps goa-daemon, gsd-smartcard, the Evolution data-server factories and gnome-shell from holding a smart card open. The factory builds the same opensc; Utah ships the module config in /etc/pkcs11/modules, which p11-kit reads in place of the RPM's same-named /usr/share/p11-kit/modules copy. pam-pkcs11, which Dakota ships preset-disabled, follows once the factory publishes it (projectbluefin/utah-packages#1030). Closes #1257 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore(common): drop overrides Common no longer needs The Containerfile removed /etc/dconf/db/distro.d/05-bluefin-searchlight- extension, which the pinned Common (sha256:9faad517) no longer ships, so the rm and its comment were dead. Utah's copy of pipewire-pulse.conf.d/50-bluefin-bt-switch.conf only added `pulse.cmd = [ ]`, which Common's copy now carries itself; drop the override and pin Common's line in the desktop contract so a Common regression fails the build. Utah keeps tracking Common's latest digest through Renovate rather than Dakota's release tag; the containerfile skill records why. Closes #1267 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(services): run the remaining upstream preset units Dakota runs Under enable-by-default (#1233) the units upstream presets turn on and a booted Dakota runs are already enabled: nvme-cli's NVMe-oF boot connections (condition-gated on config or FC hardware), systemd-imdsd.socket, the system speech-dispatcherd.service, podman.service, and netavark's DHCP proxy and firewall-reload hooks. The desktop contract now asserts them, and the tests resolve each against the presets. mdadm's mdcheck_start, mdcheck_continue and mdmonitor-oneshot timers stay off: 98-utah-enable-default.preset disables them and the contract asserts it. Utah keeps raid-check.timer (#1268), which the mdcheck pair would duplicate, and Fedora's always-on mdmonitor.service would pull the oneshot reminder in daily on every machine, where it exits 1 without an mdadm.conf alert address. systemd-homed-firstboot belongs to #1238. Closes #1271 Closes #1272 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(services): give gssproxy its state directories and enable nfs-client.target nfs-client.target pulls in gssproxy.service through auth-rpcgss-module.service, whose Wants= applies even without a keytab. gssproxy's StateDirectory=gssproxy/clients gssproxy/rcache failed with 238/STATE_DIRECTORY: clean-stage strips /var, so systemd has to create the directories, and the SELinux policy gives init_t no add_name on gssproxy_var_lib_t. Ship tmpfiles.d/utah-gssproxy.conf with the RPM's three directories and modes; systemd-tmpfiles may create and label them. With gssproxy fixed, nfs-client.target is enabled as Dakota's elements/bluefin/nfs-utils.bst presets it: 85-utah-desktop.preset drops its disable, so Hummingbird's 90-default.preset enables the target, and the desktop contract asserts it. Closes #1269 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore(packages): drop evolution-ews-core Dakota ships no Evolution, so the Exchange plugin is no longer a parity item (owner decision on #10). Remove it from packages/base.toml, dropping the [fedora_v42] section it was the only entry of, and from [unavailable] with its comment. Regenerated site data and documented counts (7 -> 6 genuinely unavailable). Refs #10 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(packages): install gst-thumbnailers in place of ffmpegthumbnailer, as on Dakota Dakota ships GNOME's gst-thumbnailers (gnome-build-meta core/gst-thumbnailers.bst, 1.1.0) and no ffmpegthumbnailer. Both register for the same video MIME types and GNOME's thumbnail factory uses one thumbnailer per type; only the GStreamer one previews H.264, through openh264dec, since the factory's ffmpeg-free has no H.264 (#1116). Request gst-thumbnailers in [parity] and [factory].parity and drop ffmpegthumbnailer. The factory fixed the build in projectbluefin/utah-packages#1015 but has not published it yet; the package transaction resolves once a factory image carrying it is pinned. Closes #1262 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(contract): merge the two nsswitch.conf assertions from nss-mdns and homed Both landed as separate [configuration.file_contains] keys for the same path, which TOML rejects. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(packages): hold qemu-kvm until virtiofsd publishes The published qemu-system-x86 Requires vhostuser-backend(fs), which only virtiofsd (utah-packages#1147, merged but not yet published) provides, so the package transaction failed in check-repos and the offline snapshot. qemu-kvm moves to [unavailable] with virtiofsd and libvirt (#1021); the guest agents, toolbox and the rest stay installed. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(time): drop the orphaned chrony account with the package bootc container lint --fatal-warn failed every image build on #1309: erasing chrony removes its sysusers.d file but leaves the chrony entries in /etc/passwd and /etc/group. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(homed): drop the homed PAM stack and homed-firstboot Owner decision on #1238: Utah keeps Fedora's account model so Fedora users have a clean migration path, and GNOME OS has not moved to homed either. authselect's with-systemd-homed, the homed-firstboot drop-in and the homed PAM/nsswitch assertions go; systemd-homed-firstboot.service is disabled in 98-utah-enable-default.preset and listed in [services].disabled, so enable-by-default cannot bring back its console prompt. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(ujust): keep Common's toggle-user-motd and check-local-overrides Dakota's toggle-user-motd toggled ~/.config/no-show-user-motd, but Common's uwelcome.sh keeps the banner state in ~/.config/uwelcome/disabled, so the recipe could never bring the banner back. check-local-overrides was gone, and the testsuite runs it on Utah. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(kernel): build zswap and zstd into the OGC kernel kargs.d/20-zswap.toml sets zswap.enabled=1 zswap.compressor=zstd on every image, but x86_64_defconfig has neither, so on the gaming flavors the swapfile ran uncompressed. Both are built in (zswap initialises before the initramfs could load a zstd module) and gated; the ZRAM option and gate go with zram-generator. This rebuilds the kernel cache once. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(units): ublue-firstboot-date describes Utah, not Dakota Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs(virt): record why qemu-kvm and virtiofsd still do not resolve At factory c288398 virtiofsd publishes, but qemu-common needs ipxe-roms-qemu and qemu-ui-sdl needs SDL2_image, neither in the factory or Hummingbird, and libvirt is unpublished. Keep all five in [unavailable], tracked by the reopened utah-packages#1021, and stop claiming QEMU/KVM is installed. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs(packages): restore gst-thumbnailers wording lost in the main merge The merge of main brought back ffmpegthumbnailer in package-contract.md. The manifest installs gst-thumbnailers (#1262) and lists it in [factory].parity, so the doc says so again. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: mergeraptor[bot] <267480593+mergeraptor[bot]@users.noreply.github.com>
What
git-lfs(Hummingbird's build, 3.8.1) in[parity]./etc/gitconfigand its[filter "lfs"]stanza incontracts/bluefin-desktop.toml.Why
Dakota pulls in freedesktop-sdk
components/git-lfs.bst(projectbluefin/dakotaelements/bluefin/deps.bst). The element's integration command appends this stanza to/etc/gitconfig:Hummingbird's
git-lfsRPM runsgit lfs install --systemin%post, which writes the same four keys, so Utah ships no copy of its own. This is the same approach Utah takes for NetworkManager's polkit rule: assert the file in the contract and leave the package-owned copy alone. Documented indocs/skills/desktop-contract/references/dakota-system-defaults.md.The
git-lfstriage entry inbaselines/triage.tomldrops at the nextjust baselinesrefresh, as the package-contract skill describes.Closes #1259
Verification
rpm -qp --scripts git-lfs-3.8.1-0.2.hum1.x86_64.rpm(Hummingbird):%postrunsgit-lfs install --system --skip-repo.dnf install git-lfsinfedora:44, thencat -A /etc/gitconfig: the output holds the[filter "lfs"]stanza with all four keys.just checkpasses (1330 tests).