saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move the linux-devel.x86_64 package back to install section. remove the upgrade function.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-08-10 11:44:34 -07:00 • committed by Pedro Algarvio
parent 244a052a5e
commit 9a512e5c4b
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bootstrap-salt.sh
View file

@ -2204,16 +2204,6 @@ __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
@ -7044,13 +7034,9 @@ 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"
__PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel linux-devel.x86_64"
# shellcheck disable=SC2086
__tdnf_install_noinput ${__PACKAGES} || return 1
__PACKAGES="linux-devel.x86_64"
# shellcheck disable=SC2086
__tdnf_upgrade_noinput ${__PACKAGES} || return 1
fi
if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then