From e8945f926c2bf467c21df7ba7b06d7a196ce7175 Mon Sep 17 00:00:00 2001 From: Kamil Godzwon Date: Fri, 20 May 2022 06:04:01 -0400 Subject: [PATCH] scripts/pkgdep: adjusting packages for sles Disabled installing markdownlint due to ruby version issue. Changed packages name according to packages available from a repository. Signed-off-by: Kamil Godzwon Change-Id: Iea22d78dedad5386ab30d6bdd79cd7e961eaee72 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12756 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Dong Yi Reviewed-by: Konrad Sztyber Reviewed-by: Pawel Piatek Reviewed-by: Karol Latecki Reviewed-by: --- scripts/pkgdep/common.sh | 2 +- scripts/pkgdep/sles.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pkgdep/common.sh b/scripts/pkgdep/common.sh index db6012fdc..5143d4c83 100755 --- a/scripts/pkgdep/common.sh +++ b/scripts/pkgdep/common.sh @@ -109,7 +109,7 @@ install_markdownlint() { if [[ $INSTALL_DEV_TOOLS == true ]]; then install_shfmt install_spdk_bash_completion - if [[ $ID != centos && $ID != rocky ]]; then + if [[ $ID != centos && $ID != rocky && $ID != sles ]]; then install_markdownlint else echo "mdl not supported on $ID, disabling" diff --git a/scripts/pkgdep/sles.sh b/scripts/pkgdep/sles.sh index cb1be5871..cac645523 100755 --- a/scripts/pkgdep/sles.sh +++ b/scripts/pkgdep/sles.sh @@ -2,15 +2,15 @@ # Minimal install zypper install -y gcc gcc-c++ make cunit-devel libaio-devel libopenssl-devel \ - libuuid-devel python-base ncurses-devel json-c-devel libcmocka-devel ninja meson \ - python-pyelftools + libuuid-devel python-base ncurses-devel libjson-c-devel libcmocka-devel \ + ninja meson python3-pyelftools # Additional dependencies for DPDK zypper install -y libnuma-devel nasm # Additional dependencies for ISA-L used in compression zypper install -y autoconf automake libtool help2man if [[ $INSTALL_DEV_TOOLS == "true" ]]; then # Tools for developers - zypper install -y git-core lcov python-pycodestyle sg3_utils \ + zypper install -y git-core lcov python3-pycodestyle sg3_utils \ pciutils ShellCheck bash-completion fi if [[ $INSTALL_PMEM == "true" ]]; then