Merge remote-tracking branch 'upstream/main'

.github/workflows/build_iso.yml

@@ -120,8 +120,8 @@ jobs:
           variant: 'Kinoite'
           version: ${{ matrix.major_version }}
           image_tag: ${{ steps.generate-tag.outputs.tag }}
-          secure_boot_key_url: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
-          enrollment_password: 'ublue-os'
+          secure_boot_key_url: 'https://github.com/ublue-os/bazzite/raw/main/secure_boot.der'
+          enrollment_password: 'universalblue'
           iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}.iso
           enable_cache_dnf: "false"
           enable_cache_skopeo: "false"

Containerfile

@@ -9,7 +9,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 
 FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods
 FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods-extra
-FROM ghcr.io/ublue-os/fsync:latest AS fsync
+FROM ghcr.io/ublue-os/fsync-kernel:${FEDORA_MAJOR_VERSION} AS fsync
 
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS drelbsos
 
@@ -148,7 +148,7 @@ RUN rpm-ostree cliwrap install-to-root / && \
         echo "Will install ${KERNEL_FLAVOR} kernel" && \
         rpm-ostree override replace \
         --experimental \
-            /tmp/fsync-rpms/kernel-6*.rpm \
+            /tmp/fsync-rpms/kernel-[0-9]*.rpm \
             /tmp/fsync-rpms/kernel-core-*.rpm \
             /tmp/fsync-rpms/kernel-modules-*.rpm \
             /tmp/fsync-rpms/kernel-uki-virt-*.rpm \

just_scripts/build-iso-installer-main.sh

@@ -131,13 +131,13 @@ ${container_mgr} run --rm --privileged  \
     ENABLE_CACHE_DNF="false" \
     ENABLE_CACHE_SKOPEO="false" \
     ENABLE_FLATPAK_DEPENDENCIES="false" \
-    ENROLLMENT_PASSWORD="ublue-os" \
+    ENROLLMENT_PASSWORD="universalblue" \
     EXTRA_BOOT_PARAMS="${extra_boot_params}" \
     FLATPAK_REMOTE_REFS_DIR="${flatpak_dir_shortname}" \
     IMAGE_NAME="${tag}" \
     IMAGE_REPO="localhost" \
     IMAGE_TAG="${latest}-${git_branch}" \
     ISO_NAME="build/${tag}-${git_branch}.iso" \
-    SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \
+    SECURE_BOOT_KEY_URL='https://github.com/ublue-os/bazzite/raw/main/secure_boot.der' \
     VARIANT="${variant}" \
     VERSION="${latest}"

just_scripts/build-iso.sh

@@ -131,13 +131,13 @@ ${container_mgr} run --rm --privileged  \
     ENABLE_CACHE_DNF="false" \
     ENABLE_CACHE_SKOPEO="false" \
     ENABLE_FLATPAK_DEPENDENCIES="false" \
-    ENROLLMENT_PASSWORD="ublue-os" \
+    ENROLLMENT_PASSWORD="universalblue" \
     EXTRA_BOOT_PARAMS="${extra_boot_params}" \
     FLATPAK_REMOTE_REFS_DIR="${flatpak_dir_shortname}" \
     IMAGE_NAME="${tag}" \
     IMAGE_REPO="localhost" \
     IMAGE_TAG="${latest}-${git_branch}" \
     ISO_NAME="build/${tag}-${git_branch}.iso" \
-    SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \
+    SECURE_BOOT_KEY_URL='https://github.com/ublue-os/bazzite/raw/main/secure_boot.der' \
     VARIANT="${variant}" \
     VERSION="${latest}"

spec_files/gamescope/chimeraos.patch

@@ -722,7 +722,7 @@ index d9182aa..776e014 100644
 +				if (pending_gesture_y && previous_ty > rounded_ty && !pending_osk && rounded_ty <= g_nOutputWidth - edge_range_y && rounded_ty > g_nOutputHeight - gesture_limits_y) {
 +					wlserver_gesture_flush();
 +					pending_osk = true;
-+					//wlserver_open_steam_osk(1);
++					wlserver_open_steam_osk(1);
 +				}
 +				previous_tx = rounded_tx;
 +				previous_ty = rounded_ty;

spec_files/gamescope/gamescope.spec

@@ -2,11 +2,11 @@
 
 %global _default_patch_fuzz 2
 %global build_timestamp %(date +"%Y%m%d")
-%global gamescope_tag 3.14.23
+%global gamescope_tag 3.14.24
 
 Name:           gamescope
 Version:        100.%{gamescope_tag}
-Release:        12.bazzite
+Release:        13.bazzite
 Summary:        Micro-compositor for video games on Wayland
 
 License:        BSD
@@ -112,7 +112,7 @@ sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/m
 %build
 cd gamescope
 export PKG_CONFIG_PATH=pkgconfig
-%meson -Dpipewire=enabled -Dinput_emulation=enabled -Ddrm_backend=enabled -Drt_cap=enabled -Davif_screenshots=enabled -Dsdl2_backend=enabled
+%meson -Dpipewire=enabled -Dinput_emulation=disabled -Ddrm_backend=enabled -Drt_cap=enabled -Davif_screenshots=enabled -Dsdl2_backend=enabled
 %meson_build
 
 %install

spec_files/steamdeck-dsp/bazzite.patch

@@ -48,12 +48,12 @@ index ac7adb6..d46bb14 100755
 
  unidentified ()
 diff --git a/pipewire-confs/systemd/system/pipewire-sysconf.service b/pipewire-confs/systemd/system/pipewire-sysconf.service
-index 1528ccc..361c2ad 100644
+index 449a278..baf3a3c 100644
 --- a/pipewire-confs/systemd/system/pipewire-sysconf.service
 +++ b/pipewire-confs/systemd/system/pipewire-sysconf.service
 @@ -11,7 +11,7 @@
  Description=Hardware Specific Pipewire Configuration
- After=multi-user.target
+ Before=multi-user.target
  Requisite=multi-user.target
 -ConditionPathIsDirectory=/run
 +Requires=pipewire-workaround.service
@@ -120,12 +120,12 @@ index 3f03354..1e43489 100755
 
  unidentified ()
 diff --git a/wireplumber/systemd/system/wireplumber-sysconf.service b/wireplumber/systemd/system/wireplumber-sysconf.service
-index 6ae50a9..cac828f 100644
+index cdf5ed9..81cca6e 100644
 --- a/wireplumber/systemd/system/wireplumber-sysconf.service
 +++ b/wireplumber/systemd/system/wireplumber-sysconf.service
 @@ -11,7 +11,7 @@
  Description=Hardware Specific Wireplumber Configuration
- After=multi-user.target
+ Before=multi-user.target
  Requisite=multi-user.target
 -ConditionPathIsDirectory=/run
 +Requires=wireplumber-workaround.service

spec_files/steamdeck-dsp/fedora.patch

@@ -35,7 +35,7 @@ index 90a1e12..43f03e0 100644
                          control = {
                              "VAD Threshold (%)" = 23.0
 diff --git a/pipewire-confs/systemd/system/pipewire-sysconf.service b/pipewire-confs/systemd/system/pipewire-sysconf.service
-index abc1f5d..1528ccc 100644
+index ffbdd97..449a278 100644
 --- a/pipewire-confs/systemd/system/pipewire-sysconf.service
 +++ b/pipewire-confs/systemd/system/pipewire-sysconf.service
 @@ -17,7 +17,7 @@ Before=shutdown.target
@@ -48,7 +48,7 @@ index abc1f5d..1528ccc 100644
  [Install]
  WantedBy=multi-user.target
 diff --git a/scripts/install_plugins.sh b/scripts/install_plugins.sh
-index ad10f23..d43cd81 100755
+index ad10f23..320aa0a 100755
 --- a/scripts/install_plugins.sh
 +++ b/scripts/install_plugins.sh
 @@ -1,4 +1,4 @@
@@ -84,7 +84,7 @@ index 842edb2..3f03354 100755
  set -eu
 
 diff --git a/wireplumber/systemd/system/wireplumber-sysconf.service b/wireplumber/systemd/system/wireplumber-sysconf.service
-index 4ba3ad6..6ae50a9 100644
+index 92b811c..cdf5ed9 100644
 --- a/wireplumber/systemd/system/wireplumber-sysconf.service
 +++ b/wireplumber/systemd/system/wireplumber-sysconf.service
 @@ -17,7 +17,7 @@ Before=shutdown.target

system_files/desktop/shared/usr/libexec/bazzite-hardware-setup

@@ -103,7 +103,7 @@ elif [[ ":ROG Ally X RC72LA:" =~ ":$SYS_ID:" ]]; then
     echo "Adding SG Display for ASUS Ally X"
     NEEDED_KARGS+=("--append-if-missing=amdgpu.sg_display=0")
   fi
-elif [[ ":G1617-01:" =~ ":$SYS_ID:" && ! $CPU_MODEL =~ 8640U|8840U ]]; then
+elif [[ ":G1617-01:" =~ ":$SYS_ID:" && ! $CPU_MODEL =~ 8640U|8840U|7640U ]]; then
   if [[ ! $KARGS =~ "video" ]]; then
     echo "Adding panel orientation for GPD Win Mini 2023"
     NEEDED_KARGS+=("--append-if-missing=video=eDP-1:panel_orientation=right_side_up")

system_files/desktop/shared/usr/libexec/bazzite-user-setup

@@ -18,7 +18,7 @@ BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite"
 mkdir -p "$BAZZITE_CONFIG_DIR"
 
 # SCRIPT VERSION
-USER_SETUP_VER=36
+USER_SETUP_VER=40
 USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version"
 USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version"
 USER_SETUP_IMAGE_VER_FILE=$BAZZITE_CONFIG_DIR/image_name""