Merge branch 'testing'

ublue-os · May 8, 2024 · 6ec681f · 6ec681f
2 parents 0f6db90 + a86138f
commit 6ec681f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Containerfile b/Containerfile
@@ -68,7 +68,18 @@ RUN rpm-ostree cliwrap install-to-root / && \
     ostree container commit
 
 # Setup firmware
-RUN mkdir -p /tmp/linux-firmware-neptune && \
+RUN mkdir -p /tmp/mediatek-firmware && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/6b91b2ef6f4173099c1434e5d7c552e51814e26e/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/6b91b2ef6f4173099c1434e5d7c552e51814e26e/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/0a18a7292a66532633d9586521f0b954c68a9fbc/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7961_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/0a18a7292a66532633d9586521f0b954c68a9fbc/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7961_1.bin && \
+    mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/ && \
+    rm -rf /tmp/mediatek-firmware && \
+    mkdir -p /tmp/linux-firmware-neptune && \
     curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-cali.bin https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/jupiter-20231113.1/cs35l41-dsp1-spk-cali.bin && \
     curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-cali.wmfw https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/jupiter-20231113.1/cs35l41-dsp1-spk-cali.wmfw && \
     curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-prot.bin https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/jupiter-20231113.1/cs35l41-dsp1-spk-prot.bin && \

diff --git a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup
@@ -179,7 +179,7 @@ fi
 
 # FRAMEWORK 13 AMD FIXES
 if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
-  if [[ $SYS_ID == "Laptop ("* ]];
+  if [[ $SYS_ID == "Laptop ("* ]]; then
     if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
       if [[ ! -f /etc/modprobe.d/alsa.conf ]]; then
         echo 'Fixing 3.5mm jack'

diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup
@@ -116,8 +116,6 @@ else
         echo 'Setting Framework logo menu'
         dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
         dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 4
-        echo 'Enabling natural scroll'
-        dconf write /org/gnome/desktop/peripherals/mouse/natural-scroll true
         echo 'Adjusting OSD position'
         dconf write /org/gnome/shell/extensions/just-perfection/osd-position 4
         if [[ $SYS_ID == "Laptop ("* ]]; then

diff --git a/system_files/desktop/silverblue/usr/etc/environment b/system_files/desktop/silverblue/usr/etc/environment
@@ -4,3 +4,6 @@ OBS_USE_EGL=1
 
 # Required for GNOME VRR MR
 MUTTER_DEBUG_FORCE_KMS_MODE=simple
+
+# https://gitlab.gnome.org/GNOME/mutter/-/issues/3037
+MUTTER_DEBUG_KMS_THREAD_TYPE=user