Stay mesa 23.1.9 for now

WhitewaterFoundry · Nov 11, 2023 · 98b38e3 · 98b38e3
1 parent d12bd8c
commit 98b38e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/create-targz.sh b/create-targz.sh
@@ -136,7 +136,7 @@ EOF
   echo "##[section] 'Install MESA"
   systemd-nspawn -q --resolv-conf="replace-host" -D "${TMPDIR}"/dist --pipe /bin/bash <<EOF
 dnf -y install 'dnf-command(versionlock)'
-dnf -y install --allowerasing --nogpgcheck mesa-dri-drivers-23.0.2-wsl_3 mesa-libGL-23.0.2-wsl_3 mesa-va-drivers-23.0.2-wsl_3 mesa-vdpau-drivers-23.0.2-wsl_3 mesa-libEGL-23.0.2-wsl_3 mesa-libgbm-23.0.2-wsl_3 mesa-libxatracker-23.0.2-wsl_3 mesa-vulkan-drivers-23.0.2-wsl_3 glx-utils vdpauinfo libva-utils
+dnf -y install --allowerasing --nogpgcheck mesa-dri-drivers-23.1.9-wsl mesa-libGL-23.1.9-wsl mesa-va-drivers-23.1.9-wsl mesa-vdpau-drivers-23.1.9-wsl mesa-libEGL-23.1.9-wsl mesa-libgbm-23.1.9-wsl mesa-libxatracker-23.1.9-wsl mesa-vulkan-drivers-23.1.9-wsl glx-utils vdpauinfo libva-utils
 dnf versionlock add mesa-dri-drivers mesa-libGL mesa-filesystem mesa-libglapi mesa-va-drivers mesa-vdpau-drivers mesa-libEGL mesa-libgbm mesa-libxatracker mesa-vulkan-drivers
 
 /usr/sbin/groupadd -g 44 wsl-video
@@ -146,9 +146,9 @@ EOF
   echo "##[section] 'Setup WSLU"
   systemd-nspawn -q --resolv-conf="replace-host" -D "${TMPDIR}"/dist --pipe /bin/bash <<EOF
 (
-  source /etc/os-release && dnf -y copr enable wslutilities/wslu "\${ID_LIKE}-38-${arch}"
+  #source /etc/os-release && dnf -y copr enable wslutilities/wslu "\${ID_LIKE}-38-${arch}"
 )
-sudo sed -i "s/\$releasever/38/g" /etc/yum.repos.d/_copr\:copr.fedorainfracloud.org\:wslutilities\:wslu.repo
+#sudo sed -i "s/\$releasever/38/g" /etc/yum.repos.d/_copr\:copr.fedorainfracloud.org\:wslutilities\:wslu.repo
 dnf -y install wslu
 EOF
 

diff --git a/linux_files/upgrade.sh b/linux_files/upgrade.sh
@@ -18,8 +18,8 @@ sudo rm -f /var/lib/rpm/.rpm.lock
 sudo dnf -y update --nogpgcheck
 sudo rm -f /var/lib/rpm/.rpm.lock
 
-# WSLU 3 is not installed
-if [[ "$(wslsys -v | grep -c "v3\.")" -eq 0 ]]; then
+# WSLU 4 is not installed
+if [[ "$(wslsys -v | grep -c "v4\.")" -eq 0 ]]; then
   (
     source /etc/os-release && sudo dnf -y copr enable wslutilities/wslu "${ID_LIKE}"-"${VERSION_ID}"-"$(uname -m)"
   )
@@ -45,8 +45,8 @@ sudo curl -L -f "${base_url}/linux_files/local.conf" -o /etc/fonts/local.conf
 # Install mesa
 source /etc/os-release
 
-declare -a mesa_version=('23.0.2-wsl_2' '23.1.9-wsl')
-declare -a target_version=('37' '38')
+declare -a mesa_version=('23.0.2-wsl_2' '23.1.9-wsl' '23.1.9-wsl')
+declare -a target_version=('37' '38' '39')
 declare -i length=${#mesa_version[@]}
 
 for (( i = 0; i < length; i++ )); do