From f33d1e799a090693c3adb3bbbdf2577975515fb2 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Fri, 26 Apr 2024 10:46:03 -0500 Subject: [PATCH 1/7] fix: bazzite-user-setup should only run when needed (#1020) --- system_files/desktop/shared/usr/libexec/bazzite-user-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup index 494fd6b442..1206214856 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup @@ -33,7 +33,7 @@ USER_SETUP_FEDORA_VER_RAN=$(cat $USER_SETUP_FEDORA_VER_FILE) USER_SETUP_IMAGE_VER_RAN=$(cat $USER_SETUP_IMAGE_VER_FILE) # Run script if updated -if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_RAN && -f $USER_SETUP_FEDORA_VER_FILE ]]; then +if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_FILE && -f $USER_SETUP_FEDORA_VER_FILE ]]; then if [[ $USER_SETUP_VER = "$USER_SETUP_VER_RAN" && $FEDORA_VERSION = "$USER_SETUP_FEDORA_VER_RAN" && $BASE_IMAGE_NAME = "$USER_SETUP_IMAGE_VER_RAN" ]]; then echo "User setup v$USER_SETUP_VER has already run. Exiting..." exit 0 From 0ab537c39ff659dd1df68867a447fe84e1257b13 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 26 Apr 2024 12:44:28 -0700 Subject: [PATCH 2/7] chore: This is why we can't have nice things --- Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 30e4994d18..5cd3850ce9 100644 --- a/Containerfile +++ b/Containerfile @@ -420,8 +420,7 @@ RUN rpm-ostree install \ mangohud.x86_64 \ mangohud.i686 \ vk_hdr_layer.x86_64 \ - vk_hdr_layer.i686 \ - goverlay && \ + vk_hdr_layer.i686 && \ if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \ rpm-ostree override remove \ gamemode \ From 0c1a55c629c3a12bd42818f3a487f897a9d6115f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 26 Apr 2024 14:20:54 -0700 Subject: [PATCH 3/7] fix: Correct issue with Steam refusing to launch on some multi-gpu hardware when launched on the dGPU. --- system_files/desktop/shared/usr/bin/bazzite-steam | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system_files/desktop/shared/usr/bin/bazzite-steam b/system_files/desktop/shared/usr/bin/bazzite-steam index ec14b42fa1..b729999693 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-steam +++ b/system_files/desktop/shared/usr/bin/bazzite-steam @@ -11,6 +11,9 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam if [ -f $HOME/.local/share/Steam/ubuntu12_32/steamui.so ]; then LAUNCH_OPTIONS="-steamdeck" fi +elif [[ $(switcherooctl list | grep -o 'Device:' | wc -l) > 1 ]]; then + # If we're running this on a dGPU, disable accelerated cef + LAUNCH_OPTIONS="-cef-disable-gpu" fi if [[ "$XDG_SESSION_TYPE" == "wayland" ]]; then From 376f46ce272253273ac452cfdd531de66d7c7835 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 26 Apr 2024 14:22:44 -0700 Subject: [PATCH 4/7] chore: Keep dGPU check even for deck images --- system_files/desktop/shared/usr/bin/bazzite-steam | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/system_files/desktop/shared/usr/bin/bazzite-steam b/system_files/desktop/shared/usr/bin/bazzite-steam index b729999693..b2d55bf262 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-steam +++ b/system_files/desktop/shared/usr/bin/bazzite-steam @@ -9,11 +9,13 @@ LAUNCH_OPTIONS="" # to maintain the gamemode update branch if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then if [ -f $HOME/.local/share/Steam/ubuntu12_32/steamui.so ]; then - LAUNCH_OPTIONS="-steamdeck" + LAUNCH_OPTIONS+=" -steamdeck" fi -elif [[ $(switcherooctl list | grep -o 'Device:' | wc -l) > 1 ]]; then - # If we're running this on a dGPU, disable accelerated cef - LAUNCH_OPTIONS="-cef-disable-gpu" +fi + +# If we're running this on a dGPU, disable accelerated cef +if [[ $(switcherooctl list | grep -o 'Device:' | wc -l) > 1 ]]; then + LAUNCH_OPTIONS+=" -cef-disable-gpu" fi if [[ "$XDG_SESSION_TYPE" == "wayland" ]]; then From c4670d271d3b97740b6b6ffdb128e9f8668661a4 Mon Sep 17 00:00:00 2001 From: Jon Mulder Date: Fri, 26 Apr 2024 17:55:42 -0400 Subject: [PATCH 5/7] fix(bazzite-user-setup): include in file check and move after first if statement (#1023) Follow-up from: #w1020 Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> --- .../desktop/shared/usr/libexec/bazzite-user-setup | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup index 1206214856..caa32cab5d 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup @@ -28,12 +28,12 @@ if [[ -f "$HOME/.bazzite-configured-fedora-version" ]]; then mv -f "$HOME/.bazzite-configured-fedora-version" "$USER_SETUP_FEDORA_VER_FILE" fi -USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE) -USER_SETUP_FEDORA_VER_RAN=$(cat $USER_SETUP_FEDORA_VER_FILE) -USER_SETUP_IMAGE_VER_RAN=$(cat $USER_SETUP_IMAGE_VER_FILE) - # Run script if updated -if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_FILE && -f $USER_SETUP_FEDORA_VER_FILE ]]; then +if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_FILE && -f $USER_SETUP_IMAGE_VER_FILE ]]; then + USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE) + USER_SETUP_FEDORA_VER_RAN=$(cat $USER_SETUP_FEDORA_VER_FILE) + USER_SETUP_IMAGE_VER_RAN=$(cat $USER_SETUP_IMAGE_VER_FILE) + if [[ $USER_SETUP_VER = "$USER_SETUP_VER_RAN" && $FEDORA_VERSION = "$USER_SETUP_FEDORA_VER_RAN" && $BASE_IMAGE_NAME = "$USER_SETUP_IMAGE_VER_RAN" ]]; then echo "User setup v$USER_SETUP_VER has already run. Exiting..." exit 0 From 9588b5a671b0673fb2e834116b0e05527b2024cb Mon Sep 17 00:00:00 2001 From: Jon Mulder Date: Sat, 27 Apr 2024 03:18:11 -0400 Subject: [PATCH 6/7] chore(akmods): add in akmods-extra to support common/extra breakout in ublue-os/akmods#163 (#1009) Co-authored-by: Kyle Gospodnetich --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 5cd3850ce9..c3bed14945 100644 --- a/Containerfile +++ b/Containerfile @@ -104,7 +104,8 @@ RUN mkdir -p /tmp/linux-firmware-neptune && \ ostree container commit # Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion -COPY --from=ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms +COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms +COPY --from=ghcr.io/ublue-os/akmods-extra:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ rpm-ostree install \ From 7444f0277da4a5439978134cf76c97a14f932878 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 27 Apr 2024 00:23:09 -0700 Subject: [PATCH 7/7] chore: Restore bmi260 kmod --- Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile b/Containerfile index c3bed14945..31940d01f0 100644 --- a/Containerfile +++ b/Containerfile @@ -122,6 +122,7 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo /tmp/akmods-rpms/kmods/*ayaneo-platform*.rpm \ /tmp/akmods-rpms/kmods/*ayn-platform*.rpm \ /tmp/akmods-rpms/kmods/*framework-laptop*.rpm \ + /tmp/akmods-rpms/kmods/*bmi260*.rpm \ /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ ostree container commit