Repository navigation
feat(config): install Dakota's and GNOME OS's config subpackages #1297
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
1e4136e
4387c33
d58caa2
c386e61
291c1d0
9eb8c36
44c0f3e
0f31328
8289f5d
386b0d8
f901c18
1d08d12
a29fdb9
b2a623f
a742cde
24f821c
3885c22
5180ed8
496e004
52f9ce0
b7bc346
6b0b718
ca8b4cc
0e4be73
bf5ab71
630d421
330bc39
9b12323
c83109e
6dfe887
d7b70c7
d4b9108
d430560
2c6c4f3
f642c49
42cc999
45b1463
dd7e476
57b7b81
ef3d110
08d5b9c
1440fd8
d63900e
4d35c8d
ea63eaf
c015ca6
f530be6
9f863b7
408874d
1d93f2f
fb09c42
65b5e62
ef2539f
b0e36c9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
@@ -326,12 +335,9 @@ ARG ENABLE_SSHD=0 | |
| # is otherwise unverified. Both move together, so Renovate updates both. | ||
| ARG UUPD_VERSION=v1.5.5 | ||
| ARG UUPD_SHA256=d8d420a153de11589abad3292eef2131a75ac3487414065a2661a558ef0d027c | ||
| # The two systemd units come from raw.githubusercontent at the same tag, and a | ||
| # git tag move changes what raw.* serves for them without touching the release | ||
| # asset the checksum above covers. uupd.service runs as root on a timer, so | ||
| # verify the units against their own digests too; all four ARGs move together. | ||
| ARG UUPD_SERVICE_SHA256=65dd2b64dcb6a9f77227612aa624ef17fe43b32eb835b51d7d22a22755dc21a8 | ||
| ARG UUPD_TIMER_SHA256=bbb5f098ec33d047bdef571e0bc112364df157e0f92d73e0febab703c4a3c099 | ||
| # The units, uupd-manual.service, the polkit rule and /etc/uupd/config.json | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. correctness (still present from the previous review): Common still ships Fix: drop Common's copy before the package transaction, next to the existing Search Light removal at rm -f /etc/dconf/db/distro.d/05-bluefin-searchlight-extension && \
+ rm -f /etc/uupd/config.json && \Add a sentence about it to the comment above that RUN (Common's distrobox-only uupd config would otherwise block |
||
| # are Dakota's (elements/bluefin/uupd.bst), installed by the factory's | ||
| # dakota-config-uupd package; only the binary is downloaded here. | ||
|
|
||
| # Hummingbird defaults to a server preset that disables unlisted services; | ||
| # Utah's presets enable them instead, as Dakota does (#1233). | ||
|
|
@@ -361,12 +367,6 @@ RUN --mount=type=bind,from=artwork,source=/out/branding,target=/tmp/utah-artwork | |
| -o /tmp/uupd/uupd_Linux_x86_64.tar.gz && \ | ||
| echo "${UUPD_SHA256} /tmp/uupd/uupd_Linux_x86_64.tar.gz" | sha256sum --check --strict && \ | ||
| tar -xzf /tmp/uupd/uupd_Linux_x86_64.tar.gz -C /tmp/uupd && \ | ||
| curl -fsSL "https://raw.githubusercontent.com/ublue-os/uupd/${UUPD_VERSION}/uupd.service" \ | ||
| -o /tmp/uupd/uupd.service && \ | ||
| curl -fsSL "https://raw.githubusercontent.com/ublue-os/uupd/${UUPD_VERSION}/uupd.timer" \ | ||
| -o /tmp/uupd/uupd.timer && \ | ||
| echo "${UUPD_SERVICE_SHA256} /tmp/uupd/uupd.service" | sha256sum --check --strict && \ | ||
| echo "${UUPD_TIMER_SHA256} /tmp/uupd/uupd.timer" | sha256sum --check --strict && \ | ||
| /usr/local/libexec/utah-build-gnome-extensions && \ | ||
| /usr/local/libexec/utah-verify-gnome-extensions --record-provenance && \ | ||
| glib-compile-schemas /usr/share/glib-2.0/schemas && \ | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[correctness] Common's
/etc/uupd/config.jsonstill blocks Dakota's packaged config.Containerfile:224runscp -a /tmp/utah-inputs/tmp/utah-common/. /. Common shipssystem_files/shared/etc/uupd/config.json, which only disables distrobox and has nobat-min-percent. The package transaction runs later, atContainerfile:283.dakota-config.spec:365marks this file%config(noreplace). When an unowned file that differs is already on disk, RPM keeps that file and writes the package's copy asconfig.json.rpmnew. The result: the contract pin'"bat-min-percent": 20'(contracts/bluefin-desktop.toml:330-332) fails, and the image runs Common's config, not Dakota's. The/usr/libunits are not marked config, so they are replaced correctly. Only the/etcfile is affected. Common does not shipuupd.rules.Fix: drop Common's copy before the package transaction. Put it next to the existing Search Light removal at
Containerfile:232:rm -f /etc/dconf/db/distro.d/05-bluefin-searchlight-extension && \ + rm -f /etc/uupd/config.json && \Also add a test assertion that the Containerfile removes it. The current
test_dakota_uupd_files_come_from_the_factory_and_are_requiredonly checks for the pin, so it passes either way.