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 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" 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) 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 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", 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} 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 45301f0a9e3..00000000000 Binary files a/system_files/shared/usr/share/plymouth/themes/spinner/kinoite-watermark.png and /dev/null differ 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'