Merge "scripts: install-deps: Add 'make' to the required packages"

This commit is contained in:
Jenkins 2017-06-16 08:59:52 +00:00 committed by Gerrit Code Review
commit 7c9bb5e07c

View File

@ -4,10 +4,15 @@ set -eu
declare -A PKG_MAP declare -A PKG_MAP
CHECK_CMD_PKGS=( CHECK_CMD_PKGS=(
gcc
git
libffi libffi
libopenssl libopenssl
make
net-tools net-tools
python-devel python-devel
venv
wget
) )
# Check zypper before apt-get in case zypper-aptitude # Check zypper before apt-get in case zypper-aptitude
@ -21,6 +26,7 @@ if [ -x '/usr/bin/zypper' ]; then
[git]=git [git]=git
[libffi]=libffi-devel [libffi]=libffi-devel
[libopenssl]=libopenssl-devel [libopenssl]=libopenssl-devel
[make]=make
[net-tools]=net-tools [net-tools]=net-tools
[python]=python [python]=python
[python-devel]=python-devel [python-devel]=python-devel
@ -41,6 +47,7 @@ elif [ -x '/usr/bin/apt-get' ]; then
[git]=git [git]=git
[libffi]=libffi-dev [libffi]=libffi-dev
[libopenssl]=libssl-dev [libopenssl]=libssl-dev
[make]=make
[net-tools]=net-tools [net-tools]=net-tools
[python]=python-minimal [python]=python-minimal
[python-devel]=libpython-dev [python-devel]=libpython-dev
@ -58,6 +65,7 @@ elif [ -x '/usr/bin/dnf' ] || [ -x '/usr/bin/yum' ]; then
[git]=git [git]=git
[libffi]=libffi-devel [libffi]=libffi-devel
[libopenssl]=openssl-devel [libopenssl]=openssl-devel
[make]=make
[net-tools]=net-tools [net-tools]=net-tools
[python]=python [python]=python
[python-devel]=python-devel [python-devel]=python-devel