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
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
path = system_files/shared/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io
url = https://github.com/projectbluefin/gnome-shell-extension-gsconnect.git
branch = main
[submodule "system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com"]
path = system_files/shared/usr/share/gnome-shell/extensions/search-light@icedman.github.com
url = https://github.com/projectbluefin/search-light.git
branch = main
[submodule "system_files/shared/usr/share/gnome-shell/extensions/custom-command-list@storageb.github.com"]
path = system_files/shared/usr/share/gnome-shell/extensions/custom-command-list@storageb.github.com
url = https://github.com/projectbluefin/custom-command-menu.git
Expand Down
7 changes: 6 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ RUN for pair in install-packages.py:utah-install-packages \
cp -a /tmp/utah-bluefin/. / && \
cp -a /tmp/utah-brew/. / && \
cp -a /tmp/utah-local/. / && \
rm -rf /tmp/utah-scripts /tmp/utah-common /tmp/utah-bluefin /tmp/utah-brew /tmp/utah-local
rm -rf /tmp/utah-scripts /tmp/utah-common /tmp/utah-bluefin /tmp/utah-brew /tmp/utah-local && \
rm -f /etc/dconf/db/distro.d/05-bluefin-searchlight-extension
# The last line drops Common's settings for the Search Light extension. Utah no
# longer ships that extension: its shader code calls set_shader_source, which
# GNOME 51 removed, so it errored at load and failed the ISO end-to-end test.
# Settings for an extension the image does not carry are noise in dconf.

# This first check covers the flavor-independent contract only, which is why it
# pins IMAGE_FLAVOR=main. verify-rpm-contract.py reads IMAGE_FLAVOR from the
Expand Down
1 change: 0 additions & 1 deletion contracts/bluefin-desktop.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ files = [
"/etc/dconf/db/distro.d/02-bluefin-keybindings",
"/etc/dconf/db/distro.d/03-bluefin-ptyxis-palette",
"/etc/dconf/db/distro.d/04-bluefin-custom-command-menu",
"/etc/dconf/db/distro.d/05-bluefin-searchlight-extension",
"/etc/dconf/db/distro.d/locks/01-bluefin-locked-settings",
]

Expand Down
7 changes: 5 additions & 2 deletions docs/skills/desktop-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,13 @@ The TOML's sections are the contract's table of contents:
## GNOME extensions are pinned submodules

Bluefin's GNOME extension submodules are retained with their normal build
step. `.gitmodules` pins nine of them by URL and branch under
step. `.gitmodules` pins eight of them by URL and branch under
`system_files/shared/usr/share/gnome-shell/extensions/` — appindicator,
bazaar-integration, blur-my-shell, caffeine, custom-command-list,
dash-to-dock, gradia-integration, gsconnect, and search-light.
dash-to-dock, gradia-integration, and gsconnect. Search Light was dropped:
its shader code calls `set_shader_source`, which GNOME 51 removed, so the
extension errored at load and failed the ISO end-to-end test on every
flavor.

`scripts/verify-gnome-extensions.py` asserts every one declares GNOME 51 in
its `metadata.json`. It runs in two modes from the same script:
Expand Down
14 changes: 14 additions & 0 deletions docs/skills/kernel-cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,20 @@ on cache extraction. Never omit a dracut module to work around a missing kernel
feature. Changes to this contract invalidate the cache through the existing
script hash and require a real kernel rebuild plus the ISO boot tests.

The contract also covers the display. `x86_64_defconfig` enables DRM and the
Intel i915 driver and nothing else, so on any other GPU, QEMU's included, the
OGC kernel registered no DRM device: GDM started, mutter had no KMS device to
open, and the gaming flavors failed the ISO test on a black screen with
`no gnome-shell running for liveuser` while `main`, on the distribution
kernel, came up through `simpledrm`. The script enables `SYSFB_SIMPLEFB` and
`DRM_SIMPLEDRM` (the firmware framebuffer as a KMS device on any hardware),
plus `DRM_VIRTIO_GPU` and `DRM_BOCHS` for VMs, and gates on `DRM_SIMPLEDRM`
like the filesystem options. Native drivers for real gaming GPUs (amdgpu, xe)
are not enabled yet: they need linux-firmware in the image, which the install
set does not carry (projectbluefin/utah#97). When diagnosing a black live
session, compare `live-serial.log` for `[drm] Initialized` lines between the
`main` and `gaming` diagnostics artifacts before reading GDM logs.

```bash
just kernel-cache-tag
just check
Expand Down
31 changes: 24 additions & 7 deletions iso/scripts/luks-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,21 @@ echo " gnome-shell: running as ${TEST_USER}"

# A shell session that started is not the same as one whose extensions loaded.
# Assert the enabled extensions raised no load-time error this boot -- the
# GNOME-51 breaks this test exists to catch (GSConnect's clipboard final-type,
# Search Light's dropped shader API) surface here as "Error"/"TypeError" lines
# GNOME-51 breaks this test exists to catch (GSConnect's clipboard final-type;
# Search Light's dropped shader API, before it was removed) surface here as "Error"/"TypeError" lines
# against the extension uuid. UTAH_E2E_EXTENSIONS lists the ones that must load
# clean; empty to skip.
EXT_CHECK="${UTAH_E2E_EXTENSIONS-gsconnect@andyholmes.github.io search-light@icedman.github.com}"
#
# Every listed extension is evaluated before the test gives its verdict, and
# the failures are reported together. Stopping at the first one costs a whole
# run per broken extension -- this check is the last step of a ~35-minute
# six-phase test, so serially discovering two known GNOME 51 breaks (the
# GSConnect clipboard final-type and Search Light's dropped shader API, which
# are separate fixes) takes two runs to learn what one run already knew. The
# run still fails; it just says everything it found.
EXT_CHECK="${UTAH_E2E_EXTENSIONS-gsconnect@andyholmes.github.io}"
if [[ -n "${EXT_CHECK}" ]]; then
ext_failures=()
for uuid in ${EXT_CHECK}; do
# State is the authoritative signal: an extension that threw at enable
# is ERROR/OUT_OF_DATE, one that loaded is ACTIVE. Grepping the journal
Expand All @@ -535,17 +544,25 @@ if [[ -n "${EXT_CHECK}" ]]; then
# while asserting nothing.) Fail, and print the raw output.
echo " extension ${uuid}: state could not be read" >&2
ssh_target "env BASH_ENV=/dev/null bash --noprofile --norc -c \"gnome-extensions info '${uuid}' 2>&1 | head -20\"" >&2 2>/dev/null || true
shot installed-ext-unreadable "${MONITOR_INSTALLED}" || true
fail "could not read the state of extension ${uuid}"
shot "installed-ext-unreadable-${uuid%%@*}" "${MONITOR_INSTALLED}" || true
ext_failures+=("${uuid}: state could not be read")
continue
fi
if [[ "${state}" != "ACTIVE" && "${state}" != "ENABLED" ]]; then
echo " extension ${uuid}: state=${state}" >&2
ssh_target "env BASH_ENV=/dev/null bash --noprofile --norc -c \"journalctl --user -b --no-pager 2>/dev/null | grep -F '${uuid}' | grep -iE 'Error|TypeError|Exception|not a function' | tail -5\"" >&2 2>/dev/null || true
shot installed-ext-error "${MONITOR_INSTALLED}" || true
fail "extension ${uuid} did not reach ACTIVE on GNOME 51 (state=${state})"
shot "installed-ext-error-${uuid%%@*}" "${MONITOR_INSTALLED}" || true
ext_failures+=("${uuid}: state=${state}")
continue
fi
echo " extension ${uuid}: ${state}"
done
if (( ${#ext_failures[@]} > 0 )); then
for failure in "${ext_failures[@]}"; do
echo " FAILED: ${failure}" >&2
done
fail "${#ext_failures[@]} extension(s) did not reach ACTIVE on GNOME 51"
fi
fi

# Ask for the user's *graphical* session by id rather than taking the first
Expand Down
3 changes: 0 additions & 3 deletions scripts/build-gnome-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ fi
# Custom Command Menu
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

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

echo "::endgroup::"
22 changes: 21 additions & 1 deletion scripts/install-ogc-kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,21 @@ DNF="$(command -v dnf5 || command -v dnf)"
# dracut's dmsquash-live requires overlayfs and reads a zstd squashfs through
# a loop device. Installed OSTree roots and the LUKS ISO test need the other
# filesystem/device-mapper features too; x86 defconfig is not a live-OS config.
#
# A display, too. x86_64 defconfig turns on DRM and i915 and nothing else, so
# on any machine whose GPU is not an Intel iGPU -- every QEMU guest included --
# the kernel registered no DRM device at all. GDM started, mutter found no KMS
# device to open, and the gaming flavors failed the ISO end-to-end test on a
# black screen with "no gnome-shell running for liveuser", while main, on the
# distribution kernel, came up through simpledrm on the firmware framebuffer.
# SYSFB_SIMPLEFB makes sysfb hand the EFI/VESA framebuffer to a
# simple-framebuffer device, and DRM_SIMPLEDRM drives it: an unaccelerated but
# real KMS device on any hardware, until a native driver takes over.
required_config=(SCHED_CLASS_EXT NTSYNC ANDROID_BINDERFS
OVERLAY_FS SQUASHFS SQUASHFS_ZSTD EROFS_FS
BLK_DEV_LOOP ISO9660_FS BLK_DEV_DM DM_SNAPSHOT DM_CRYPT
CRYPTO_XTS FUSE_FS FS_VERITY)
CRYPTO_XTS FUSE_FS FS_VERITY
SYSFB_SIMPLEFB DRM_SIMPLEDRM)
verify_config() {
local config="$1" symbol
for symbol in "${required_config[@]}"; do
Expand Down Expand Up @@ -118,6 +129,14 @@ scripts/config --module OVERLAY_FS --module SQUASHFS --enable SQUASHFS_ZSTD \
--module EROFS_FS --enable BLK_DEV_LOOP --enable ISO9660_FS \
--enable BLK_DEV_DM --module DM_SNAPSHOT --module DM_CRYPT \
--module CRYPTO_XTS --module FUSE_FS --enable FS_VERITY
# The firmware framebuffer as a KMS device (see required_config above), plus
# the two paravirtual GPUs QEMU offers, so a VM gets a proper display rather
# than the boot framebuffer. Native GPU drivers for real gaming hardware
# (amdgpu, xe) are a separate decision: they need linux-firmware in the image,
# which the install set does not carry yet (projectbluefin/utah#97).
scripts/config --enable SYSFB --enable SYSFB_SIMPLEFB \
--enable DRM --enable DRM_SIMPLEDRM \
--module DRM_VIRTIO_GPU --module DRM_BOCHS
scripts/config --set-str LOCALVERSION "-ogc1" --disable LOCALVERSION_AUTO
make olddefconfig

Expand All @@ -137,6 +156,7 @@ require_config() {
require_config '^CONFIG_SCHED_CLASS_EXT=y$' CONFIG_SCHED_CLASS_EXT
require_config '^CONFIG_NTSYNC=(y|m)$' CONFIG_NTSYNC
require_config '^CONFIG_ANDROID_BINDERFS=y$' CONFIG_ANDROID_BINDERFS
require_config '^CONFIG_DRM_SIMPLEDRM=y$' CONFIG_DRM_SIMPLEDRM
verify_config .config

make modules_prepare
Expand Down
1 change: 0 additions & 1 deletion scripts/verify-gnome-extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"dash-to-dock@micxgx.gmail.com": "dash-to-dock@micxgx.gmail.com/metadata.json",
"gradia-integration@alexandervanhee.github.io": "gradia-integration@alexandervanhee.github.io/src/metadata.json",
"gsconnect@andyholmes.github.io": "gsconnect@andyholmes.github.io/data/metadata.json.in",
"search-light@icedman.github.com": "search-light@icedman.github.com/metadata.json",
}


Expand Down
Submodule search-light@icedman.github.com deleted from e1d9ff
2 changes: 1 addition & 1 deletion tests/test_iso_ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_ogc_config_gate_rejects_each_missing_live_boot_feature(self):
names = gate.split("(", 1)[1].split(")", 1)[0].split()
for required in ["OVERLAY_FS", "SQUASHFS", "SQUASHFS_ZSTD", "EROFS_FS",
"BLK_DEV_LOOP", "DM_SNAPSHOT", "DM_CRYPT", "CRYPTO_XTS",
"FUSE_FS", "FS_VERITY"]:
"FUSE_FS", "FS_VERITY", "SYSFB_SIMPLEFB", "DRM_SIMPLEDRM"]:
self.assertIn(required, names)
self.assertRegex(script, rf"--(?:enable|module) {required}(?:\s|$)")
self.assertEqual(script.count("verify_config /usr/lib/utah/ogc-kernel.config"), 2)
Expand Down
Loading