From 8293f79f6fe89d520d23b17cc95927b23c0a0282 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 10 Aug 2023 08:30:49 -0700 Subject: [PATCH] Upgrade linux-devel. --- bootstrap-salt.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 537d9713d..fc03f9712 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2197,13 +2197,23 @@ __dnf_install_noinput() { #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: __tdnf_install_noinput -# DESCRIPTION: (DRY) dnf install with noinput options +# DESCRIPTION: (DRY) tdnf install with noinput options #---------------------------------------------------------------------------------------------------------------------- __tdnf_install_noinput() { tdnf -y install "${@}" || return $? } # ---------- end of function __tdnf_install_noinput ---------- +# +#--- FUNCTION ------------------------------------------------------------------------------------------------------- +# NAME: __tdnf_upgrade_noinput +# DESCRIPTION: (DRY) tdnf upgrade with noinput options +#---------------------------------------------------------------------------------------------------------------------- +__tdnf_upgrade_noinput() { + + tdnf -y upgrade "${@}" || return $? +} # ---------- end of function __tdnf_upgrade_noinput ---------- + #--- FUNCTION ------------------------------------------------------------------------------------------------------- # NAME: __git_clone_and_checkout # DESCRIPTION: (DRY) Helper function to clone and checkout salt to a @@ -7034,9 +7044,13 @@ install_photon_git_deps() { "${__python}" -m pip install "${dep}" || return 1 done else - __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel linux-devel.x86_64" + __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel" # shellcheck disable=SC2086 __tdnf_install_noinput ${__PACKAGES} || return 1 + + __PACKAGES="linux-devel" + # shellcheck disable=SC2086 + __tdnf_upgrade_noinput ${__PACKAGES} || return 1 fi if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then