Commit 0c558257 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

pkgdep: install json-c-devel and libcmocka-devel 



The coming libvfio-user needs json-c and libcmocka library, so install
the libraries in CI environment.

Change-Id: Ib4871169a4d5b140cda11a2cc449201c963a9f12
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5287


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMonica Kenguva <monica.kenguva@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent decdfa0b

scripts/pkgdep/arch.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


# Install main dependencies

pacman -Sy --needed --noconfirm gcc make cmake cunit libaio openssl \

	libutil-linux libiscsi python ncurses ninja meson

	libutil-linux libiscsi python ncurses json-c cmocka ninja meson

# Additional dependencies for SPDK CLI

pacman -Sy --needed --noconfirm python-pexpect python-pip libffi

pip install configshell_fb

scripts/pkgdep/clear-linux-os.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


# Install main dependencies

swupd bundle-add -y c-basic make cmake dev-utils openssl devpkg-libiscsi \

	devpkg-ncurses python3-basic python-extras devpkg-open-iscsi \

	devpkg-ncurses python3-basic python-extras devpkg-open-iscsi devpkg-json-c \

	storage-utils

# Additional dependencies for ISA-L used in compression

swupd bundle-add -y dev-utils-dev

scripts/pkgdep/debian.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
VERSION_ID_NUM=$(sed 's/\.//g' <<< $VERSION_ID)

# Includes Ubuntu, Debian

# Minimal install

apt-get install -y gcc g++ make cmake libcunit1-dev libaio-dev libssl-dev \

apt-get install -y gcc g++ make cmake libcunit1-dev libaio-dev libssl-dev libjson-c-dev libcmocka-dev \

	uuid-dev libiscsi-dev python libncurses5-dev libncursesw5-dev python3-pip

pip3 install ninja

pip3 install meson

scripts/pkgdep/rhel.sh

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ if [ "$(uname -m)" = "aarch64" ]; then 
fi



yum install -y gcc gcc-c++ make cmake CUnit-devel libaio-devel openssl-devel \

	libuuid-devel libiscsi-devel ncurses-devel

	libuuid-devel libiscsi-devel ncurses-devel json-c-devel libcmocka-devel

if echo "$ID $VERSION_ID" | grep -E -q 'centos 8|rhel 8'; then

	yum install -y python36

	#Create hard link to use in SPDK as python

scripts/pkgdep/sles.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


# Minimal install

zypper install -y gcc gcc-c++ make cmake cunit-devel libaio-devel libopenssl-devel \

	libuuid-devel python-base ncurses-devel ninja meson

	libuuid-devel python-base ncurses-devel json-c-devel libcmocka-devel ninja meson

# Additional dependencies for DPDK

zypper install -y libnuma-devel nasm

# Additional dependencies for ISA-L used in compression