Skip to content

Commit

Permalink
Upgrade linux-devel.
Browse files Browse the repository at this point in the history
  • Loading branch information
garethgreenaway authored and s0undt3ch committed Aug 11, 2023
1 parent ed16e58 commit 8293f79
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions bootstrap-salt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8293f79

Please sign in to comment.