From 85a647f063698aa2256f1a5108f8c5eaa0b93aae Mon Sep 17 00:00:00 2001 From: Rojin George Date: Tue, 30 Apr 2024 20:16:39 +0530 Subject: [PATCH] Install RDMA-core libraries to compile NFSOverRDMA codes in Ganesha Signed-off-by: Rojin George --- build_scripts/build-fsal/build-fsal_cephfs.sh | 2 +- build_scripts/build-fsal/build-fsal_gluster.sh | 2 +- build_scripts/build-fsal/build-fsal_gpfs.sh | 2 +- build_scripts/build-fsal/build-fsal_rgw.sh | 2 +- build_scripts/build-tests/build-tests.sh | 2 +- build_scripts/code-compilation/client.sh | 6 +++--- build_scripts/common/basic-ceph.sh | 2 +- build_scripts/common/basic-gluster.sh | 2 +- build_scripts/common/basic-storage-scale.sh | 4 ++-- build_scripts/common/basic-vfs-minmd.sh | 2 +- build_scripts/common/basic-vfs.sh | 2 +- build_scripts/ganesha-build/build-ganesha.sh | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build_scripts/build-fsal/build-fsal_cephfs.sh b/build_scripts/build-fsal/build-fsal_cephfs.sh index 811c94b5..5c2cc8e3 100644 --- a/build_scripts/build-fsal/build-fsal_cephfs.sh +++ b/build_scripts/build-fsal/build-fsal_cephfs.sh @@ -13,7 +13,7 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}" # enable the Storage SIG Gluster and Ceph repositories dnf -y install centos-release-ceph epel-release -BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel" +BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel rdma-core-devel" #BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel" diff --git a/build_scripts/build-fsal/build-fsal_gluster.sh b/build_scripts/build-fsal/build-fsal_gluster.sh index c5a167ec..103ff30b 100644 --- a/build_scripts/build-fsal/build-fsal_gluster.sh +++ b/build_scripts/build-fsal/build-fsal_gluster.sh @@ -13,7 +13,7 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}" # enable the Storage SIG Gluster and Ceph repositories yum -y install centos-release-gluster -BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel" +BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel" diff --git a/build_scripts/build-fsal/build-fsal_gpfs.sh b/build_scripts/build-fsal/build-fsal_gpfs.sh index 50b2a1b5..e4d624f0 100644 --- a/build_scripts/build-fsal/build-fsal_gpfs.sh +++ b/build_scripts/build-fsal/build-fsal_gpfs.sh @@ -13,7 +13,7 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}" # enable the Storage SIG Gluster and Ceph repositories yum -y install centos-release-gluster -BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel" +BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel" diff --git a/build_scripts/build-fsal/build-fsal_rgw.sh b/build_scripts/build-fsal/build-fsal_rgw.sh index 475ba0d9..cd007150 100644 --- a/build_scripts/build-fsal/build-fsal_rgw.sh +++ b/build_scripts/build-fsal/build-fsal_rgw.sh @@ -13,7 +13,7 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}" # enable the Storage SIG Gluster and Ceph repositories yum -y install centos-release-ceph epel-release -BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel" +BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel librgw-devel libcephfs-devel" diff --git a/build_scripts/build-tests/build-tests.sh b/build_scripts/build-tests/build-tests.sh index d6841f57..b2060bc5 100644 --- a/build_scripts/build-tests/build-tests.sh +++ b/build_scripts/build-tests/build-tests.sh @@ -13,7 +13,7 @@ GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}" # enable the Storage SIG for lttng-{tools,ust}-devel yum -y install centos-release-gluster yum-utils centos-release-ceph epel-release -BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libacl-devel libblkid-devel libcap-devel gperftools-devel gtest-devel" +BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libacl-devel libblkid-devel libcap-devel gperftools-devel gtest-devel rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel boost-devel doxygen xfsprogs-devel lttng-tools-devel lttng-ust-devel" if [ "${CENTOS_VERSION}" = "7" ]; then diff --git a/build_scripts/code-compilation/client.sh b/build_scripts/code-compilation/client.sh index 8b0a19e7..a0b3c234 100644 --- a/build_scripts/code-compilation/client.sh +++ b/build_scripts/code-compilation/client.sh @@ -35,14 +35,14 @@ do if [ $once -eq 0 ] then if [ "${CENTOS_VERSION}" == "7" ]; then - yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api libnsl2-devel libcephfs-devel + yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api libnsl2-devel libcephfs-devel rdma-core-devel yum clean all & yum clean metadata yum -y install userspace-rcu-devel elif [ "${CENTOS_VERSION}" == "8s" ]; then - yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api + yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api rdma-core-devel yum -y --enablerepo=powertools install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel elif [ "${CENTOS_VERSION}" == "9s" ]; then - yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api + yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api rdma-core-devel yum -y --enablerepo=crb install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel libuuid libuuid-devel fi timeout -s SIGKILL 600s git clone --depth=1 https://review.gerrithub.io/ffilz/nfs-ganesha diff --git a/build_scripts/common/basic-ceph.sh b/build_scripts/common/basic-ceph.sh index 73aca14f..0391e587 100644 --- a/build_scripts/common/basic-ceph.sh +++ b/build_scripts/common/basic-ceph.sh @@ -68,7 +68,7 @@ else GIT_REPO=$(basename "${GERRIT_PROJECT}") GIT_URL="https://${GERRIT_HOST}/${GERRIT_PROJECT}" - BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config" + BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel" if [ "${CENTOS_VERSION}" = "7" ]; then yum -y install libgfapi-devel diff --git a/build_scripts/common/basic-gluster.sh b/build_scripts/common/basic-gluster.sh index 2fadbec1..39d6b307 100644 --- a/build_scripts/common/basic-gluster.sh +++ b/build_scripts/common/basic-gluster.sh @@ -68,7 +68,7 @@ else GIT_REPO=$(basename "${GERRIT_PROJECT}") GIT_URL="https://${GERRIT_HOST}/${GERRIT_PROJECT}" - BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config gdb" + BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config gdb rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel libcephfs-devel" if [ "${CENTOS_VERSION}" = "7" ]; then yum -y install libgfapi-devel diff --git a/build_scripts/common/basic-storage-scale.sh b/build_scripts/common/basic-storage-scale.sh index 4820864b..bde27b5d 100644 --- a/build_scripts/common/basic-storage-scale.sh +++ b/build_scripts/common/basic-storage-scale.sh @@ -46,7 +46,7 @@ ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N "" cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys chmod og-wx ~/.ssh/authorized_keys -yum -y install kernel-devel-$(uname -r) kernel-headers-$(uname -r) cpp gcc gcc-c++ binutils numactl jre make elfutils elfutils-devel rpcbind sssd-tools openldap-clients bind-utils net-tools krb5-workstation python3 +yum -y install kernel-devel-$(uname -r) kernel-headers-$(uname -r) cpp gcc gcc-c++ binutils numactl jre make elfutils elfutils-devel rpcbind sssd-tools openldap-clients bind-utils net-tools krb5-workstation python3 rdma-core-devel python3 -m pip install --user ansible #Add CES IP to /etc/hosts @@ -122,7 +122,7 @@ else GIT_REPO=$(basename "${GERRIT_PROJECT}") GIT_URL="https://${GERRIT_HOST}/${GERRIT_PROJECT}" - BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config gdb" + BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config gdb rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel libcephfs-devel" if [ "${CENTOS_VERSION}" = "7" ]; then yum -y install libgfapi-devel diff --git a/build_scripts/common/basic-vfs-minmd.sh b/build_scripts/common/basic-vfs-minmd.sh index 29a54c29..23f80129 100644 --- a/build_scripts/common/basic-vfs-minmd.sh +++ b/build_scripts/common/basic-vfs-minmd.sh @@ -66,7 +66,7 @@ else GIT_URL="https://${GERRIT_HOST}/${GERRIT_PROJECT}" #Packages required for Centos-7 and Centos8 Stream - BUILDREQUIRES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libblkid-devel libcap-devel libgfapi-devel xfsprogs-devel" + BUILDREQUIRES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libblkid-devel libcap-devel libgfapi-devel xfsprogs-devel rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel" if [ "${CENTOS_VERSION}" = "7" ]; then yum -y install ${BUILDREQUIRES} libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel python2-devel diff --git a/build_scripts/common/basic-vfs.sh b/build_scripts/common/basic-vfs.sh index b054be7a..c2c09dc2 100644 --- a/build_scripts/common/basic-vfs.sh +++ b/build_scripts/common/basic-vfs.sh @@ -66,7 +66,7 @@ else GIT_URL="https://${GERRIT_HOST}/${GERRIT_PROJECT}" #Packages required for Centos-7 and Centos8 Stream - BUILDREQUIRES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libblkid-devel libcap-devel libgfapi-devel xfsprogs-devel" + BUILDREQUIRES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libblkid-devel libcap-devel libgfapi-devel xfsprogs-devel rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel" if [ "${CENTOS_VERSION}" = "7" ]; then yum -y install ${BUILDREQUIRES} libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel python2-devel diff --git a/build_scripts/ganesha-build/build-ganesha.sh b/build_scripts/ganesha-build/build-ganesha.sh index 97a275de..a53ebff5 100644 --- a/build_scripts/ganesha-build/build-ganesha.sh +++ b/build_scripts/ganesha-build/build-ganesha.sh @@ -27,7 +27,7 @@ yum-config-manager --add-repo=https://artifacts.ci.centos.org/nfs-ganesha/nightl # enable the glusterfs repository (latest released version) yum -y install centos-release-gluster epel-release centos-release-ceph -BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config createrepo_c python3 cmake" +BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config createrepo_c python3 cmake rdma-core-devel" BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel libcephfs-devel userspace-rcu-devel" if [ "${CENTOS_VERSION}" = "7" ]; then yum -y install libgfapi-devel mock