bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Only install mesa on rhel

Browse Source
This commit is contained in:
Bryan Roessler
2022-12-20 16:57:34 -05:00
parent 447e712de8
commit 976abf9040
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
installJRMC
View File

@@ -528,7 +528,7 @@ installMCFromRepo() {
return 1 return 1
fi fi
# Install mesa-va-freeworld separately from the RPM for dnf swap # Install mesa-va-drivers-freeworld separately from the RPM for dnf swap
installMesa installMesa
declare pkg_install_cmd="installPackage --skip-check-installed --allow-downgrades --no-gpg-check $MCPKG" declare pkg_install_cmd="installPackage --skip-check-installed --allow-downgrades --no-gpg-check $MCPKG"
@@ -797,23 +797,28 @@ installMCRPM() {
####################################### #######################################
# Installs mesa-va-freeworld # Installs mesa-va-drivers-freeworld
####################################### #######################################
installMesa() { installMesa() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
if ! pkg_query mesa-va-drivers-freeworld &>/dev/null; then # Currently only necessary in Fedora/CentOS
if pkg_query mesa-va-drivers &>/dev/null; then case "$ID" in
declare pkg_swap_cmd="pkg_swap mesa-va-drivers mesa-va-drivers-freeworld" fedora|centos)
debug "$pkg_swap_cmd" || pkg_swap_cmd+=" &>/dev/null" if ! pkg_query mesa-va-drivers-freeworld &>/dev/null; then
if ! eval "$pkg_swap_cmd"; then if pkg_query mesa-va-drivers &>/dev/null; then
err "Package swap failed!" declare pkg_swap_cmd="pkg_swap mesa-va-drivers mesa-va-drivers-freeworld"
return 1 debug "$pkg_swap_cmd" || pkg_swap_cmd+=" &>/dev/null"
if ! eval "$pkg_swap_cmd"; then
err "Package swap failed!"
return 1
fi
else
pkg_install mesa-va-drivers-freeworld
fi
fi fi
else ;;
pkg_install mesa-va-drivers-freeworld esac
fi
fi
} }