Skip to content

Commit 6ec681f

Browse files
committed
Merge branch 'testing'
2 parents 0f6db90 + a86138f commit 6ec681f

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

Containerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,18 @@ RUN rpm-ostree cliwrap install-to-root / && \
6868
ostree container commit
6969

7070
# Setup firmware
71-
RUN mkdir -p /tmp/linux-firmware-neptune && \
71+
RUN mkdir -p /tmp/mediatek-firmware && \
72+
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 && \
73+
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 && \
74+
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 && \
75+
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 && \
76+
xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin && \
77+
xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin && \
78+
xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin && \
79+
xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7961_1.bin && \
80+
mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/ && \
81+
rm -rf /tmp/mediatek-firmware && \
82+
mkdir -p /tmp/linux-firmware-neptune && \
7283
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 && \
7384
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 && \
7485
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 && \

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ fi
179179

180180
# FRAMEWORK 13 AMD FIXES
181181
if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
182-
if [[ $SYS_ID == "Laptop ("* ]];
182+
if [[ $SYS_ID == "Laptop ("* ]]; then
183183
if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
184184
if [[ ! -f /etc/modprobe.d/alsa.conf ]]; then
185185
echo 'Fixing 3.5mm jack'

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

-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ else
116116
echo 'Setting Framework logo menu'
117117
dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
118118
dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 4
119-
echo 'Enabling natural scroll'
120-
dconf write /org/gnome/desktop/peripherals/mouse/natural-scroll true
121119
echo 'Adjusting OSD position'
122120
dconf write /org/gnome/shell/extensions/just-perfection/osd-position 4
123121
if [[ $SYS_ID == "Laptop ("* ]]; then

system_files/desktop/silverblue/usr/etc/environment

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ OBS_USE_EGL=1
44

55
# Required for GNOME VRR MR
66
MUTTER_DEBUG_FORCE_KMS_MODE=simple
7+
8+
# https://gitlab.gnome.org/GNOME/mutter/-/issues/3037
9+
MUTTER_DEBUG_KMS_THREAD_TYPE=user

0 commit comments

Comments
 (0)