Upgrade mesa and wwf repo 40

WhitewaterFoundry · Apr 24, 2024 · d1e5812 · d1e5812
1 parent 9870587
commit d1e5812
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/create-targz.sh b/create-targz.sh
@@ -121,7 +121,7 @@ EOF
 
   echo "##[section] 'Setup Whitewater Foundry repo"
   systemd-nspawn -q --resolv-conf="replace-host" -D "${TMPDIR}"/dist --pipe /bin/bash <<EOF
-curl -s https://packagecloud.io/install/repositories/whitewaterfoundry/fedoraremix/script.rpm.sh | env os=fedora dist=39 bash
+curl -s https://packagecloud.io/install/repositories/whitewaterfoundry/fedoraremix/script.rpm.sh | env os=fedora dist=${version_id} bash
 dnf update --refresh
 EOF
 
@@ -140,7 +140,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.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 -y install --allowerasing --nogpgcheck mesa-dri-drivers-24.0.5-wsl mesa-libGL-24.0.5-wsl mesa-va-drivers-24.0.5-wsl mesa-vdpau-drivers-24.0.5-wsl mesa-libEGL-24.0.5-wsl mesa-libgbm-24.0.5-wsl mesa-libxatracker-24.0.5-wsl mesa-vulkan-drivers-24.0.5-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

diff --git a/linux_files/upgrade.sh b/linux_files/upgrade.sh
@@ -54,15 +54,11 @@ sudo chmod +x /usr/local/bin/install-desktop.sh
 # Install mesa
 source /etc/os-release
 
-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 -a mesa_version=('23.1.9-wsl' '23.1.9-wsl' '24.0.5-wsl')
+declare -a target_version=('38' '39' '40')
 declare -i length=${#mesa_version[@]}
 
 for (( i = 0; i < length; i++ )); do
-  if [[ ${VERSION_ID} -eq '40' ]]; then
-    VERSION_ID='39'
-  fi
-
   if [[ ${VERSION_ID} -eq ${target_version[i]} && $( sudo dnf info --installed mesa-libGL | grep -c "${mesa_version[i]}" ) == 0 ]]; then
 
     sudo dnf versionlock delete mesa-dri-drivers mesa-libGL mesa-filesystem mesa-libglapi mesa-va-drivers mesa-vdpau-drivers mesa-libEGL mesa-libgbm mesa-libxatracker mesa-vulkan-drivers