From 8512e3cccc62177fe1a9e406748237214e59ec6e Mon Sep 17 00:00:00 2001 From: Jason DeTiberus <915544+detiber@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:30:32 -0500 Subject: [PATCH 1/8] chore: workaround podman image scp leaving behind temporary files in /var/tmp (#2052) --- Justfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Justfile b/Justfile index e475911ae9d..64bbe3a3cf3 100644 --- a/Justfile +++ b/Justfile @@ -284,7 +284,9 @@ rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": # Load into Rootful Podman ID=$(just sudoif podman images --filter reference=localhost/"${image_name}":"${tag}" --format "'{{ '{{.ID}}' }}'") if [[ -z "$ID" ]]; then - just sudoif podman image scp ${UID}@localhost::localhost/"${image_name}":"${tag}" root@localhost::localhost/"${image_name}":"${tag}" + COPYTMP=$(mktemp -p "${PWD}" -d -t podman_scp.XXXXXXXXXX) + just sudoif TMPDIR=${COPYTMP} podman image scp ${UID}@localhost::localhost/"${image_name}":"${tag}" root@localhost::localhost/"${image_name}":"${tag}" + rm -rf "${COPYTMP}" fi # Prep Container @@ -476,7 +478,9 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0": # Load Image into rootful podman if [[ "${UID}" -gt 0 && {{ ghcr }} == "0" ]]; then - just sudoif podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}" + COPYTMP=$(mktemp -p "${PWD}" -d -t podman_scp.XXXXXXXXXX) + just sudoif TMPDIR=${COPYTMP} podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}" + rm -rf "${COPYTMP}" fi FLATPAK_DIR_SHORTNAME="bluefin_flatpaks" From 0fd52c63ee4b80ebd74e8a60394694fae53bf459 Mon Sep 17 00:00:00 2001 From: Kristiyan <60707126+Danar435@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:22:27 +0100 Subject: [PATCH 2/8] fix: hide accent-color errors (#2056) --- system_files/shared/usr/libexec/ublue-bling-fastfetch | 2 +- system_files/shared/usr/libexec/ublue-motd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system_files/shared/usr/libexec/ublue-bling-fastfetch b/system_files/shared/usr/libexec/ublue-bling-fastfetch index c00e5f422fb..3a4f9a84dec 100755 --- a/system_files/shared/usr/libexec/ublue-bling-fastfetch +++ b/system_files/shared/usr/libexec/ublue-bling-fastfetch @@ -1,6 +1,6 @@ #!/usr/bin/env bash -THEME=$(gsettings get org.gnome.desktop.interface accent-color || echo "'slate'") +THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo "'slate'") THEME=${THEME//\'/} FASTFETCH_COLOR_SET="38;2;53;132;228" diff --git a/system_files/shared/usr/libexec/ublue-motd b/system_files/shared/usr/libexec/ublue-motd index 0e9589e421b..106143decab 100755 --- a/system_files/shared/usr/libexec/ublue-motd +++ b/system_files/shared/usr/libexec/ublue-motd @@ -30,7 +30,7 @@ KEY_WARN_FILE="/run/user-motd-sbkey-warn.md" [ -e $KEY_WARN_FILE ] && KEY_WARN="**WARNING**: $(cat $KEY_WARN_FILE)" KEY_WARN_ESCAPED=$(escape "$KEY_WARN") -THEME=$(gsettings get org.gnome.desktop.interface accent-color || echo "'slate'") +THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo "'slate'") THEME=${THEME//\'/} THEME=${MOTD_FORCE_THEME:-$THEME} From ba1824b25d20352a043b821bd0b56f7a68b82505 Mon Sep 17 00:00:00 2001 From: Barrett Date: Tue, 17 Dec 2024 18:04:30 -0500 Subject: [PATCH 3/8] chore: remove kinoite plymouth image (#2057) --- .../themes/spinner/kinoite-watermark.png | Bin 3526 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 system_files/shared/usr/share/plymouth/themes/spinner/kinoite-watermark.png diff --git a/system_files/shared/usr/share/plymouth/themes/spinner/kinoite-watermark.png b/system_files/shared/usr/share/plymouth/themes/spinner/kinoite-watermark.png deleted file mode 100644 index 45301f0a9e3edf39e209312c41b91b994463079f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3526 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 Date: Wed, 18 Dec 2024 20:43:52 -0500 Subject: [PATCH 4/8] chore(deps): update actions/upload-artifact digest to 6f51ac0 (#2058) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/reusable-build-iso.yml | 2 +- .github/workflows/reusable-build.yml | 2 +- .github/workflows/reusable-image-scan.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml index be3684b5c00..8489465cbf7 100644 --- a/.github/workflows/reusable-build-iso.yml +++ b/.github/workflows/reusable-build-iso.yml @@ -77,7 +77,7 @@ jobs: - name: Upload ISOs and Checksum to Job Artifacts if: github.ref_name == 'testing' - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4 with: name: ${{ env.ISO_NAME }} path: ${{ steps.upload-directory.outputs.iso-upload-dir }} diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 619f52fd312..f8535650cca 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -222,7 +222,7 @@ jobs: - name: Upload artifact if: github.event_name != 'pull_request' - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4 with: name: image-${{ env.IMAGE_NAME }}-${{ matrix.stream_name }} retention-days: 1 diff --git a/.github/workflows/reusable-image-scan.yml b/.github/workflows/reusable-image-scan.yml index c95119fe996..70abb9e026e 100644 --- a/.github/workflows/reusable-image-scan.yml +++ b/.github/workflows/reusable-image-scan.yml @@ -71,7 +71,7 @@ jobs: echo "name=$(echo ${IMAGE} | awk -F'/' '{print $NF}' | sed 's/:/-/g')" >> $GITHUB_OUTPUT - name: Upload scan results - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4 with: name: security-${{ steps.artifact-name.outputs.name }} if-no-files-found: error From be9c48412bdaea2445ed1b4128ef6f04380f8444 Mon Sep 17 00:00:00 2001 From: Alex Botelho Date: Thu, 19 Dec 2024 18:15:46 -0500 Subject: [PATCH 5/8] Remove freeipa-client and sssd-ipa from Bluefin images (#2061) --- packages.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages.json b/packages.json index c647cbde1ac..560863a1de2 100644 --- a/packages.json +++ b/packages.json @@ -16,7 +16,6 @@ "fish", "firewall-config", "foo2zjs", - "freeipa-client", "fuse-encfs", "gcc", "git-credential-libsecret", @@ -50,7 +49,6 @@ "setools-console", "solaar", "sssd-ad", - "sssd-ipa", "sssd-krb5", "sssd-nfs-idmap", "stress-ng", From 112dc61d181ba5f0965ff70e9072cd52e6c6a97a Mon Sep 17 00:00:00 2001 From: RoyalOughtness <129108030+RoyalOughtness@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:08:21 -0800 Subject: [PATCH 6/8] feat: set dash-to-dock to apply built-in theme (#2064) --- .../glib-2.0/schemas/zz0-bluefin-modifications.gschema.override | 1 + 1 file changed, 1 insertion(+) diff --git a/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override b/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override index 77084a6343b..d1af870f6c7 100644 --- a/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override +++ b/system_files/silverblue/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override @@ -56,6 +56,7 @@ customize-alphas=true max-alpha=0.8 min-alpha=0.5 running-indicator-style='DOTS' +apply-custom-theme=true [org.gnome.settings-daemon.plugins.power] power-button-action='interactive' From b8ccd9047809c82a3888e25f9c2e962a36a76422 Mon Sep 17 00:00:00 2001 From: Alessandro Teiji Date: Sun, 22 Dec 2024 13:49:10 -0400 Subject: [PATCH 7/8] ublue-os/bluefin fix: Update README.md with the correct project introduction link (#2068) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8fc6bedbbfc..f0dc057a594 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ > "Evolution is a process of constant branching and expansion." - Stephen Jay Gould -For end users it provides a system as reliable as a Chromebook with near-zero maintainance. For developers, a powerful cloud native developer workflow. Check [Introduction to Bluefin](https://universal-blue.discourse.group/t/introduction-to-bluefin/41) for a feature walkthrough. +For end users it provides a system as reliable as a Chromebook with near-zero maintainance. For developers, a powerful cloud native developer workflow. Check [Introduction to Bluefin](https://docs.projectbluefin.io/introduction/) for a feature walkthrough. - [Download Bluefin](https://projectbluefin.io/#scene-picker) From 2869884ed86185c7069f15f9bdbfb4a510eed88b Mon Sep 17 00:00:00 2001 From: m2 <69128853+m2Giles@users.noreply.github.com> Date: Sun, 22 Dec 2024 15:41:55 -0500 Subject: [PATCH 8/8] fix: Add skew fixes (#2069) Signed-off-by: m2Giles <69128853+m2Giles@users.noreply.github.com> --- build_files/base/01-build-fix.sh | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/build_files/base/01-build-fix.sh b/build_files/base/01-build-fix.sh index 208765af3a0..694aa92a3c8 100755 --- a/build_files/base/01-build-fix.sh +++ b/build_files/base/01-build-fix.sh @@ -17,9 +17,36 @@ for repo in "${repos[@]}"; do fi done +rpm-ostree override replace \ + --experimental \ + --from repo=updates \ + glib2 \ + || true + +rpm-ostree override replace \ + --experimental \ + --from repo=updates \ + glibc \ + glibc-common \ + glibc-all-langpacks \ + glibc-gconv-extra \ + || true + +rpm-ostree override replace \ + --experimental \ + --from repo=updates \ + libX11 \ + libX11-common \ + libX11-xcb \ + || true + rpm-ostree override replace \ --experimental \ --from repo=updates \ elfutils-libelf \ - elfutils-libs || - true + elfutils-libs \ + || true + +rpm-ostree override remove \ + glibc32 \ + || true